Merge branch 'fix/getform' into 'wrdp'

增加null != worklog 的判断

See merge request o2oa/o2oa!2018

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/worklog/ActionListWithWorkOrWorkCompleted.java

@@ -85,10 +85,13 @@ class ActionListWithWorkOrWorkCompleted extends BaseAction {
 			List<WoReadCompleted> readCompleteds = _readCompleteds.get();
 			List<WorkLog> workLogs = _workLogs.get();
 
+			if (workLogs.isEmpty()) {
+
 				WorkLogTree tree = new WorkLogTree(workLogs);
 
 				List<Wo> wos = new ArrayList<>();
-			for (WorkLog o : workLogs.stream().filter(o -> Objects.equals(ActivityType.manual, o.getFromActivityType()))
+				for (WorkLog o : workLogs.stream()
+						.filter(o -> Objects.equals(ActivityType.manual, o.getFromActivityType()))
 						.collect(Collectors.toList())) {
 					Wo wo = Wo.copier.copy(o);
 					Node node = tree.find(o);
@@ -125,7 +128,8 @@ class ActionListWithWorkOrWorkCompleted extends BaseAction {
 					}
 					/* 下一环节处理人可能是重复处理导致重复的,去重 */
 					wo.setNextTaskIdentityList(ListTools.trim(wo.getNextTaskIdentityList(), true, true));
-				wo.setNextTaskCompletedIdentityList(ListTools.trim(wo.getNextTaskCompletedIdentityList(), true, true));
+					wo.setNextTaskCompletedIdentityList(
+							ListTools.trim(wo.getNextTaskCompletedIdentityList(), true, true));
 					wos.add(wo);
 				}
 				ListTools.groupStick(wos, tasks, WorkLog.fromActivityToken_FIELDNAME, Task.activityToken_FIELDNAME,
@@ -137,6 +141,7 @@ class ActionListWithWorkOrWorkCompleted extends BaseAction {
 				ListTools.groupStick(wos, readCompleteds, WorkLog.fromActivityToken_FIELDNAME,
 						ReadCompleted.activityToken_FIELDNAME, READCOMPLETEDLIST_FIELDNAME);
 				result.setData(wos);
+			}
 			return result;
 		}
 	}