diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2Get.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2Get.java index 400e56511c3f9d29d86ddc7d4a793a4fc3850e81..01d718bcaf798f26fdf4847b6e77fc88197b3ca6 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2Get.java +++ b/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); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/worklog/ActionListWithWorkOrWorkCompleted.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/worklog/ActionListWithWorkOrWorkCompleted.java index 0b9c999a1ffdfba079be85d5e6fd1ea51de72195..80cb47ec7f75df175dd60d504bd76edb09a0fbed 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/worklog/ActionListWithWorkOrWorkCompleted.java +++ b/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 readCompleteds = _readCompleteds.get(); List workLogs = _workLogs.get(); - if (workLogs.isEmpty()) { - + if (!workLogs.isEmpty()) { WorkLogTree tree = new WorkLogTree(workLogs); - List wos = new ArrayList<>(); for (WorkLog o : workLogs.stream() .filter(o -> Objects.equals(ActivityType.manual, o.getFromActivityType()))