From 70f10d122acc9554eefe9981c97c2dc804d3595d Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 29 Nov 2023 16:01:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessFbStandardPurchaseServiceImpl.java  | 13 +++++--------
 .../common/constant/MessageTemplateCodeCommon.java  |  3 +++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
index 218881b0..90986c29 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
@@ -89,9 +89,10 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
      **/
     private String addBusinessInfo(ProcessInfoVO<List<ProcessFbStandardPurchase>> processInfoVO) {
         List<ProcessFbStandardPurchase> businessInfoList = processInfoVO.getBusinessInfoDTO();
-        String businessId = UUIDUtils.randomUUID20();
-        if (CollectionUtils.isNotEmpty(businessInfoList)) {
-            businessId = businessInfoList.get(0).getBusinessId();
+        if (CollectionUtils.isEmpty(businessInfoList)) return "";
+        String businessId = businessInfoList.get(0).getBusinessId();
+        if (StringUtils.isBlank(businessId)) {
+            businessId = UUIDUtils.randomUUID20();
         }
         processInfoVO.setBusinessId(businessId);
 
@@ -112,11 +113,7 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
 
         saveBatch(businessInfoList, businessInfoList.size()); // 保存到数据库
 
-        if (CollectionUtils.isNotEmpty(businessInfoList)) {
-            return businessInfoList.get(0).getStandardNumber() + "-" + businessInfoList.get(0).getStandardName() + "-" + "采购";
-        } else {
-            return "";
-        }
+        return businessInfoList.get(0).getStandardNumber() + "-" + businessInfoList.get(0).getStandardName() + "-" + "采购";
     }
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java
index 065f5fdf..cf373f88 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java
@@ -15,4 +15,7 @@ public class MessageTemplateCodeCommon {
     public static final String ON_THE_PRODUCTION = "on_the_production"; // 【在产车实施预警】
     public static final String LAWS_STANDARD_SHARING = "laws_standard_sharing"; // 【分享】收到分享
     public static final String ES_INSPECT_PLAN = "es_inspect_plan"; // 【企标稽查计划】流程结束
+    public static final String STANDARD_CHANGE_REPLACE = "standard_change_replace"; // 【法规变更】代替/被代替标准变更
+    public static final String STANDARD_CHANGE_REFERENCE = "standard_change_reference"; // 	【法规变更】引用标准变更
+    public static final String STANDARD_CONSULTATION = "standard_consultation"; // 	【征求意见结果提醒】
 }