From 79c136216db9518eafd53ff00670d5196476973a Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 25 Jan 2024 14:03:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B):=2080930?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessFbEntryChangeServiceImpl.java | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index 8713cb83..8246ce57 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -173,8 +173,6 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_ENTRY_CHANGE)); // 流程定义id
 //        basicProcessInfoDTO.setProcessName(getProcessNameByBusinessId(processInfoVO.getBusinessId())); // 流程名称
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型
-        // 重复性校验
-        duplicateCheck(processInfoVO.getBusinessId());
         // 删除自己的草稿
         String draftId = processInfoVO.getDraftId();
         if (StringUtils.isNotBlank(draftId)) {
@@ -201,24 +199,26 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
                     new LambdaQueryWrapper<LawsOverseasStandard>()
                             .eq(LawsOverseasStandard::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER)));
             if (documentCount > 0 || overseasCount > 0){
-                throw new JeroBootException("标准编号已入库或已发起入库流程，不可重复发起！");
+                throw new JeroBootException("标准编号不可重复入库！");
             }
 
-            List<ProcessFbEntryChange> list = list(
-                    new LambdaQueryWrapper<ProcessFbEntryChange>()
-                            .ne(ProcessFbEntryChange::getId, businessId)
-                            .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))
-                            .eq(ProcessFbEntryChange::getOperateType, "1"));
-            for (ProcessFbEntryChange processFbEntryChange : list) {
-                int count = processDraftService.count(
-                        new LambdaQueryWrapper<ProcessDraft>()
-                                .eq(ProcessDraft::getProjectId, processFbEntryChange.getId())
-                                .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
-                                        .or().isNull(ProcessDraft::getSaveSource)));
-                if (count == 0){
-                    throw new JeroBootException("标准编号已入库或已发起入库流程，不可重复发起！");
-                }
-            }
+            /**
+             *             List<ProcessFbEntryChange> list = list(
+             *                     new LambdaQueryWrapper<ProcessFbEntryChange>()
+             *                             .ne(ProcessFbEntryChange::getId, businessId)
+             *                             .eq(ProcessFbEntryChange::getStandardNumber, map.get(FieldCommon.STANDARD_NUMBER))
+             *                             .eq(ProcessFbEntryChange::getOperateType, "1"));
+             *             for (ProcessFbEntryChange processFbEntryChange : list) {
+             *                 int count = processDraftService.count(
+             *                         new LambdaQueryWrapper<ProcessDraft>()
+             *                                 .eq(ProcessDraft::getProjectId, processFbEntryChange.getId())
+             *                                 .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
+             *                                         .or().isNull(ProcessDraft::getSaveSource)));
+             *                 if (count == 0){
+             *                     throw new JeroBootException("标准编号已入库或已发起入库流程，不可重复发起！");
+             *                 }
+             *             }
+             */
         }
     }
 
@@ -241,12 +241,14 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
             Map<String, Object> objectMap = JSON.parseObject(businessInfoDTO.getBusinessJson(), Map.class);
             objectMap.put(FieldCommon.MODULE, businessInfoDTO.getSource());
             if ("1".equals(businessInfoDTO.getOperateType())) {
+                // 重复性校验
+                duplicateCheck(processInfoVO.getBusinessId());
                 // 如果是标准法规入库流程
                 lawsCommonService.commonAdd(objectMap);
             } else {
                 // 如果是标准法规变更流程
                 // 发送消息
-                sendMsg(objectMap, processInfoVO.getBusinessId());
+                sendMsg(objectMap);
                 lawsCommonService.commonEdit(objectMap);
             }
             log.info("《标准法规入库/变更流程》结束，流程名称：{}", basicProcessInfoDTO.getProcessName());
@@ -258,7 +260,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
      * @Date: 2023/11/29 16:55
      * @Description: 发消息
      **/
-    private void sendMsg(Map<String, Object> objectMap, String businessId) {
+    private void sendMsg(Map<String, Object> objectMap) {
         String module = (String) objectMap.get(FieldCommon.MODULE);
         String id = (String) objectMap.get("id");
         String standardNumber = (String) objectMap.get(FieldCommon.STANDARD_NUMBER);