diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index bd7b1cee9e..75deb3ffbd 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -2421,17 +2421,18 @@ public class FlowTaskService extends MybatisBaseService map = flowableQuery.getMap(); boolean taskKeyTrue = false; List flowElements = processService.calApprovePath("", modelId, map); + // 过滤空的节点ID List collect = flowElements.stream().filter(item -> item.getId().length() > 0).collect(Collectors.toList()); for (int i = 0; i < collect.size(); i++) { Map itemMap = new HashMap<>(); FlowElement item = collect.get(i); if (StringUtils.isBlank(flowableQuery.getTaskDefKey())) { - log.info("flowElement:{}", item); - log.info("nodeName:{}", item.getName()); +// log.info("flowElement:{}", item); +// log.info("nodeName:{}", item.getName()); itemMap.put("nodeName", item.getName()); - log.info("nodeId:{}", item.getId()); +// log.info("nodeId:{}", item.getId()); itemMap.put("nodeId", item.getId()); - String s = JSON.toJSONString(item); + /* String s = JSON.toJSONString(item); JSONObject jsonObject = JSONObject.parseObject(s); log.info("item:{}", jsonObject); Object candidateGroups = jsonObject.get("candidateGroups"); @@ -2442,7 +2443,7 @@ public class FlowTaskService extends MybatisBaseService 0) { log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0)); } - log.info("candidateGroups:{}", candidateGroups_arr); + log.info("candidateGroups:{}", candidateGroups_arr);*/ list.add(itemMap); } else { if (flowableQuery.getTaskDefKey().equals(item.getId())) { @@ -2450,12 +2451,12 @@ public class FlowTaskService extends MybatisBaseService 0) { log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0)); } - log.info("candidateGroups:{}", candidateGroups_arr); + log.info("candidateGroups:{}", candidateGroups_arr);*/ list.add(itemMap); } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index f624dc56d6..75d6d874c5 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -256,7 +256,7 @@ public class FlowableRest implements FlowableFeign { stringObjectMap.put("taskName", f.get("nodeName").toString()); stringObjectMap.put("finishTime", null); stringObjectMap.put("createTime", ""); - stringObjectMap.put("taskUserInfos", new ArrayList<>()); + stringObjectMap.put("taskUserInfos", Collections.emptyList()); a.setFlowableRecordVo(stringObjectMap); a.setState("3");