fix: 立项变更/变更发起报错

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -14,12 +14,12 @@ import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
+import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
 import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
 import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
 import com.jero.modules.activiti.process.esInitChange.mapper.ProcessEsInitChangeMapper;
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
-import com.jero.modules.activiti.service.ProcessNodeService;
 import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
 import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
 import com.jero.modules.sys.utils.UserUtils;
@@ -59,9 +59,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     @Resource
     private ProcessNodeLinkService processNodeLinkService;
 
-    @Resource
-    private ProcessNodeService processNodeService;
-
     @Resource
     private RuntimeService runtimeService;
 
@@ -155,27 +152,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         return initChangeDataVO;
     }
 
-//    private InitChangeFlowUserVO getProcessUserInfo(String processDefinitionId, String processInstanceId) {
-//        List<ProcessNode> nodeList = processNodeService.getNodeList(processDefinitionId, processInstanceId);
-//        InitChangeFlowUserVO initChangeFlowUserVO = new InitChangeFlowUserVO();
-//        Map<String, ProcessNode> userMap = nodeList.stream()
-//                .collect(Collectors.groupingBy(ProcessNode::getVariableName))
-//                .values()
-//                .stream()
-//                .map(nodes -> nodes.get(0)) // 选择每组的第一个元素
-//                .collect(Collectors.toMap(ProcessNode::getVariableName, node -> node));
-//        Optional.ofNullable(userMap.get("createUser")).ifPresent(node -> initChangeFlowUserVO.setCreateUser(node.getLinkUserIds()));
-//        Optional.ofNullable(userMap.get("contactUser")).ifPresent(node -> initChangeFlowUserVO.setContactUser(node.getLinkUserIds()));
-//        Optional.ofNullable(userMap.get("standardExpertList")).ifPresent(node -> initChangeFlowUserVO.setStandardExpert(node.getLinkUserIds()));
-//        Optional.ofNullable(userMap.get("mainDraftUserLeader")).ifPresent(node -> initChangeFlowUserVO.setMainDraftUserLeader(node.getLinkUserIds()));
-//        Optional.ofNullable(userMap.get("mainDraftUserLeaderLeader")).ifPresent(node -> initChangeFlowUserVO.setMainDraftUserLeaderLeader(node.getLinkUserIds()));
-//        Optional.ofNullable(userMap.get("standardizationApprovalUser")).ifPresent(node -> initChangeFlowUserVO.setStandardizationApprovalUser(node.getLinkUserIds()));
-//        Optional.ofNullable(userMap.get("newMainDraftUserLeaderLeader")).ifPresent(node -> initChangeFlowUserVO.setNewMainDraftUserLeaderLeader(node.getLinkUserIds()));
-//        Optional.ofNullable(userMap.get("newMainDraftUserLeader")).ifPresent(node -> initChangeFlowUserVO.setNewMainDraftUserLeader(node.getLinkUserIds()));
-//        Optional.ofNullable(userMap.get("relatedUserList")).ifPresent(node -> initChangeFlowUserVO.setRelatedUser(node.getLinkUserIds()));
-//        return initChangeFlowUserVO;
-//    }
-
     @Override
     public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) {
         String userId = UserUtils.getUserId();
@@ -249,8 +225,11 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     public void startRunTask(InitChangeDataVO initChangeData) {
         List<ProcessEsInitChange> esInitChangeList = initChangeData.getDataList();
         // 校验企标编号是否冲突
-        if (!esUtil.verifyEnStandardNumber(esInitChangeList.get(0).getNewEnStandardNo())) {
+        ProcessEsInitChange initChange = esInitChangeList.get(0);
-            throw new JeroBootException("企标编号冲突，请重新生成");
+        if (initChange.getProjectType().equals(ESPProjectType.ENACT.getValue())) {
+            if (!esUtil.verifyEnStandardNumber(initChange.getNewEnStandardNo())) {
+                throw new JeroBootException("企标编号冲突，请重新生成");
+            }
         }
     }