Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2021

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2Get.java

@@ -33,10 +33,8 @@ class V2Get extends BaseAction {
 			CacheKey cacheKey = new CacheKey(this.getClass(), id);
 			Optional<?> optional = CacheManager.get(cacheCategory, cacheKey);
 			if (optional.isPresent()) {
-				System.out.println("!!!!!!!!!!!!!!!!!!!getForm from cache");
 				result.setData((Wo) optional.get());
 			} else {
-				System.out.println("!!!!!!!!!!!!!!!!!!!getForm from db");
 				Wo wo = this.get(business, id);
 				CacheManager.put(cacheCategory, cacheKey, wo);
 				result.setData(wo);

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

@@ -85,10 +85,8 @@ class ActionListWithWorkOrWorkCompleted extends BaseAction {
 			List<WoReadCompleted> readCompleteds = _readCompleteds.get();
 			List<WorkLog> workLogs = _workLogs.get();
 
-			if (workLogs.isEmpty()) {
-
+			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()))