!1297 fix: 修复simple设计器第一个发起人节点，审批时校验是否存在审批人导致流程异常

Merge pull request !1297 from SamllNorth_Lee/feature/bpm

!1297 fix: 修复simple设计器第一个发起人节点，审批时校验是否存在审批人导致流程异常
Merge pull request !1297 from SamllNorth_Lee/feature/bpm
芋道源码 · Gitee
2 parents 67e548d5 629bf284
Showing 2 changed files with 17 additions and 12 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
@@ -267,7 +267,6 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService 
         FlowElement flowElement = bpmnModel.getFlowElement(task.getTaskDefinitionKey());
         List<FlowNode> nextFlowNodes = BpmnModelUtils.getNextFlowNodes(flowElement, bpmnModel, processVariables);
-        // TODO @小北：还是可以优化下哈；“4. 组装节点信息” 只拼接出 candidateUserIds；之后，再第二次循环，查询用户和部门信息，进行拼接
         // 2. 收集所有节点的候选用户 ID
         Set<Long> allCandidateUsers = new HashSet<>();
         for (FlowNode node : nextFlowNodes) {
@@ -287,13 +286,13 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService 
                     loginUserId, historicProcessInstance.getProcessDefinitionId(), processVariables);
             // 4.2 组装候选用户信息
-            List<UserSimpleBaseVO> candidateUsers = new ArrayList<>();
-            for (Long userId : candidateUserIds) {
-                UserSimpleBaseVO user = BpmProcessInstanceConvert.INSTANCE.buildUser(userId, userMap, deptMap);
+            List<UserSimpleBaseVO> candidateUsers = convertList(candidateUserIds, userId -> {
+                AdminUserRespDTO user = userMap.get(userId);
                 if (user != null) {
-                    candidateUsers.add(user);
+                    return BpmProcessInstanceConvert.INSTANCE.buildUser(userId, userMap, deptMap);
                 }
-            }
+                return null;
+            });
             // 4.3 构建节点信息
             return new ActivityNode()
@@ -599,6 +599,10 @@ public class BpmTaskServiceImpl implements BpmTaskService {
      */
     private Map<String, Object> validateAndSetNextAssignees(String taskDefinitionKey, Map<String, Object> variables, BpmnModel bpmnModel,
                                                             Map<String, List<Long>> nextAssignees, ProcessInstance processInstance) {
+        // Simple设计器第一个节点默认为发起人节点，不校验是否存在审批人
+        if (taskDefinitionKey.equals(START_USER_NODE_ID)) {
+            return variables;
+        }
         // 1. 获取下一个将要执行的节点集合
         FlowElement flowElement = bpmnModel.getFlowElement(taskDefinitionKey);
         List<FlowNode> nextFlowNodes = getNextFlowNodes(flowElement, bpmnModel, variables);
@@ -609,16 +613,17 @@ public class BpmTaskServiceImpl implements BpmTaskService {
             Integer candidateStrategy = parseCandidateStrategy(nextFlowNode);
             // 2.1 情况一：如果节点中的审批人策略为 发起人自选
             if (ObjUtil.equals(candidateStrategy, BpmTaskCandidateStrategyEnum.START_USER_SELECT.getStrategy())) {
-                // 如果节点存在，但未配置审批人
-                List<Long> assignees = nextAssignees != null ? nextAssignees.get(nextFlowNode.getId()) : null;
-                if (CollUtil.isEmpty(assignees)) {
-                    throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, nextFlowNode.getName());
-                }
+                // 先从历史中获取审批人，在发起人会把所有的审批人保存到历史中，这里从历史中获取
                 processVariables = FlowableUtils.getStartUserSelectAssignees(processInstance.getProcessVariables());
                 // 特殊：如果当前节点已经存在审批人，则不允许覆盖
                 if (processVariables != null && CollUtil.isNotEmpty(processVariables.get(nextFlowNode.getId()))) {
                     continue;
                 }
+                // 如果节点存在，但未配置审批人
+                List<Long> assignees = nextAssignees != null ? nextAssignees.get(nextFlowNode.getId()) : null;
+                if (CollUtil.isEmpty(assignees)) {
+                    throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, nextFlowNode.getName());
+                }
                 // 设置 PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES
                 if (processVariables == null) {
                     processVariables = new HashMap<>();
@@ -628,12 +633,13 @@ public class BpmTaskServiceImpl implements BpmTaskService {
             }
             // 2.2 情况二：如果节点中的审批人策略为 审批人，在审批时选择下一个节点的审批人，并且该节点的审批人为空
             if (ObjUtil.equals(candidateStrategy, BpmTaskCandidateStrategyEnum.APPROVE_USER_SELECT.getStrategy())) {
+                // 获取审批人自选的历史变量
+                processVariables = FlowableUtils.getApproveUserSelectAssignees(processInstance.getProcessVariables());
                 // 如果节点存在，但未配置审批人
                 List<Long> assignees = nextAssignees != null ? nextAssignees.get(nextFlowNode.getId()) : null;
                 if (CollUtil.isEmpty(assignees)) {
                     throw exception(PROCESS_INSTANCE_APPROVE_USER_SELECT_ASSIGNEES_NOT_CONFIG, nextFlowNode.getName());
                 }
-                processVariables = FlowableUtils.getApproveUserSelectAssignees(processInstance.getProcessVariables());
                 if (processVariables == null) {
                     processVariables = new HashMap<>();
                 }