From 816258e4232a1d17d79335a2829b887cf4debc64 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 23 Feb 2024 17:07:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081947=20=E5=9C=A8=E7=BA=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91--=E7=AD=BE=E7=AB=A0=E9=A1=B5=E7=9A=84=E7=AD=BE?=
 =?UTF-8?q?=E7=AB=A0=E5=9C=A8=E9=A9=B3=E5=9B=9E=E5=88=B0=E4=B8=BB=E8=B5=B7?=
 =?UTF-8?q?=E8=8D=89=E4=BA=BA=E4=B8=8A=E4=BC=A0=E4=BC=9A=E8=AE=AE=E7=BA=AA?=
 =?UTF-8?q?=E8=A6=81=E8=8A=82=E7=82=B9=E5=90=8E=EF=BC=8C=E6=8D=A2=E4=BA=BA?=
 =?UTF-8?q?=E3=80=81=E8=BD=AC=E5=8A=9E=E7=AD=89=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E7=AD=BE=E7=AB=A0=E4=BF=A1=E6=81=AF=E6=9C=AA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index be7a3eeb..8a0fd5f4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -726,12 +726,21 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         }
         result.put("校对签署", otherDraftUsers);
 
-        // 获取主管级领导审核用户
+        // 获取审核签署+主管级领导用户
+        List<SignInfo> approvalLeaders = new ArrayList<>();
         processApprovalRecords = parMap.get(LEADER_APPROVAL);
+        List<String> approvalUserList = (List<String>) runtimeService.getVariable(processInstanceId, "mainDraftUserLeaderList");
+        // 剔除所有驳回的记录
+        processApprovalRecords.removeIf(ar -> ar.getCommitFlag().equals(CommitFlagEnum.REJECT.getValue()));
         // 将processApprovalRecords按照EndTime倒序排序
         processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
-        singInfo = this.getSingInfo(processApprovalRecords.get(0));
-        result.put("审核签署", Collections.singletonList(singInfo));
+        // 取list.size()个数据
+        processApprovalRecords = processApprovalRecords.subList(0, approvalUserList.size());
+        for (ProcessApprovalRecord processApprovalRecord : processApprovalRecords) {
+            singInfo = this.getSingInfo(processApprovalRecord);
+            approvalLeaders.add(singInfo);
+        }
+        result.put("审核签署", approvalLeaders);
 
         // 获取标准化签署+标准化审核用户
         processApprovalRecords = parMap.get(STANDARDIZATION_APPROVAL);