Merge branch 'hotfix/lastManualScript' into 'master'

修复在最后的人工环节在'活动流转完成'事件中无法获取recordList

See merge request o2oa/o2oa!2617

(cherry picked from commit a8b72cf7)

5c982ec1 修复在最后的人工环节在'活动流转完成'事件中无法获取recordList
833d1548 增加输出recordList的排序

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 {