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 approvalLeaders = new ArrayList<>(); processApprovalRecords = parMap.get(LEADER_APPROVAL); + List approvalUserList = (List) 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);