From dc43cc9128b666846091495d67bdb95d2657e453 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 22 Jan 2024 15:17:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B):=2079960?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fb/service/impl/ProcessFbEntryChangeServiceImpl.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 9fa0ea3d..b02cbaf2 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
@@ -392,6 +392,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         businessInfoDTO.setBusinessJson(JSON.toJSONString(businessMap));
         businessInfoDTO.setSource((String) businessMap.get("source"));
         businessInfoDTO.setOperateType((String) businessMap.get("operateType"));
+        businessInfoDTO.setStandardNumber((String) businessMap.get(FieldCommon.STANDARD_NUMBER));
         if (StringUtils.isBlank(businessInfoDTO.getId())) { // 如果是发起时保存
             businessInfoDTO.setId(UUIDUtils.randomUUID20());
             save(businessInfoDTO);
@@ -458,7 +459,11 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
                 new LambdaQueryWrapper<ProcessAll>()
                         .in(ProcessAll::getProjectId, idList)
                         .eq(ProcessAll::getPrcStatus, "1"));
-        if (count > 0) {
+        int size = processDraftService.count(new LambdaQueryWrapper<ProcessDraft>()
+                        .in(ProcessDraft::getProjectId, idList)
+                        .and(qw -> qw.ne(ProcessDraft::getSaveSource, "3")
+                                .or().isNull(ProcessDraft::getSaveSource)));
+        if (count > 0 || size > 0) {
             throw new JeroBootException("标准编号在标准法规变更流程进行中，不可删除！");
         }
     }