From 412ef1cc789a56b5417d829f23d12e4791d9b7a3 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 16:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=8D=95=E5=AE=A1=E6=A0=B8=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=B5=81=E7=A8=8B=E6=98=AF=E5=90=A6=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TAbilityApplicationController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 656ac606..40f81a53 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -238,7 +238,7 @@ public class TAbilityApplicationController { put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id put("resourceOwnerDept", tAbilityApplicationDTOList.get(0).getResourceOwnerDept()); // 资源所属部门信息 put("resources", resourceDTOS);//申请的该部门的能力资源 - if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("通过")) { + if (tAbilityApplicationDTOList.get(0).getApproveStatus().contains("通过")) { put("ended", true); } else { put("ended", false); @@ -258,6 +258,10 @@ public class TAbilityApplicationController { return sysDeptDTO.getName(); } })); + tAbilityApplicationV2DTO.setEnded(re.keySet().stream().map(index -> { + List> index_ = re.get(index); + return index_.stream().map(temp -> !(Boolean) temp.get("ended")).findAny().orElse(Boolean.FALSE); // 存在未完成流程 + }).filter(index -> index).findAny().orElse(Boolean.FALSE)); tAbilityApplicationV2DTO.setResourceApplication(re); return new Result().ok(tAbilityApplicationV2DTO); }