o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/subjectinfo/SubjectInfoManagerUserAction.java

@@ -370,14 +370,14 @@ public class SubjectInfoManagerUserAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
-	@JaxrsMethodDescribe( value = "版块置顶", action = ActionSubjectTopToMainSection.class )
+	@JaxrsMethodDescribe( value = "版块置顶", action = ActionSubjectTopToSection.class )
 	@GET
 	@Path("topToSection/{id}")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
 	@Consumes(MediaType.APPLICATION_JSON)
 	public void topToSection( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
 			@JaxrsParameterDescribe("主贴信息ID") @PathParam("id") String id ) {
-		ActionResult<ActionSubjectTopToMainSection.Wo> result = new ActionResult<>();
+		ActionResult<ActionSubjectTopToSection.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		Boolean check = true;
 		if( check ){
@@ -389,7 +389,7 @@ public class SubjectInfoManagerUserAction extends StandardJaxrsAction {
 		}
 		if(check){
 			try {
-				result = new ActionSubjectTopToMainSection().execute( request, effectivePerson, id );
+				result = new ActionSubjectTopToSection().execute( request, effectivePerson, id );
 			} catch (Exception e) {
 				result = new ActionResult<>();
 				Exception exception = new ExceptionRoleInfoProcess( e, "版块置顶时发生异常！" );

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkContext.java

@@ -108,9 +108,17 @@ public class WorkContext {
 				list.addAll(aeiObjects.getRecords());
 				list.addAll(aeiObjects.getCreateRecords());
 			}
-			return gson.toJson(
-					list.stream().filter(o -> StringUtils.equals(o.getWork(), this.aeiObjects.getWork().getId()))
-							.collect(Collectors.toList()));
+			List<Record> records = list.stream()
+					.filter(o -> StringUtils.equals(o.getWork(), this.aeiObjects.getWork().getId()))
+					.collect(Collectors.toList());
+			// 考虑到比如已经是最后一个人工环节,那么work已经转为workCompleted,那么直接返回全部record
+			if (records.isEmpty()) {
+				return gson.toJson(list.stream().sorted(Comparator.nullsLast(Comparator.comparing(Record::getOrder)))
+						.collect(Collectors.toList()));
+			} else {
+				return gson.toJson(records.stream().sorted(Comparator.nullsLast(Comparator.comparing(Record::getOrder)))
+						.collect(Collectors.toList()));
+			}
 		} catch (Exception e) {
 			throw new IllegalStateException("getRecordList error.", e);
 		}
@@ -333,6 +341,7 @@ public class WorkContext {
 			throw new IllegalStateException("getReadCompletedList error.", e);
 		}
 	}
+
 	@Deprecated(forRemoval = true, since = "never use.")
 	public String getReviewList() {
 		try {