From 40221b91aef438b3188c60eed7e41aa7f91ec6c5 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Thu, 9 Nov 2023 14:30:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B-?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessFbEntryChangeServiceImpl.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 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 856a2e9c..bd709811 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
@@ -62,7 +62,10 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
     public void addBusinessInfo(ProcessFbEntryChange processFbEntryChange) {
         // 设置标准编号
         setStandardNumber(processFbEntryChange);
-        processFbEntryChange.setBusinessJson(JSON.toJSONString(processFbEntryChange.getBusinessMap()));
+        Map<String, Object> businessMap = processFbEntryChange.getBusinessMap();
+        processFbEntryChange.setBusinessJson(JSON.toJSONString(businessMap));
+        processFbEntryChange.setSource((String) businessMap.get("source"));
+        processFbEntryChange.setOperateType((String) businessMap.get("operateType"));
         save(processFbEntryChange);
     }
 
@@ -74,7 +77,10 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
     @Override
     public void editBusinessInfo(ProcessFbEntryChange processFbEntryChange) {
         // 设置标准编号
-        processFbEntryChange.setBusinessJson(JSON.toJSONString(processFbEntryChange.getBusinessMap()));
+        Map<String, Object> businessMap = processFbEntryChange.getBusinessMap();
+        processFbEntryChange.setBusinessJson(JSON.toJSONString(businessMap));
+        processFbEntryChange.setSource((String) businessMap.get("source"));
+        processFbEntryChange.setOperateType((String) businessMap.get("operateType"));
         updateById(processFbEntryChange);
     }
 
@@ -186,9 +192,12 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
     public void saveToDraft(ProcessInfoVO<ProcessFbEntryChange> processInfoVO) {
         // 业务信息
         ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO();
+        Map<String, Object> businessMap = businessInfoDTO.getBusinessMap();
+        businessInfoDTO.setBusinessJson(JSON.toJSONString(businessMap));
+        businessInfoDTO.setSource((String) businessMap.get("source"));
+        businessInfoDTO.setOperateType((String) businessMap.get("operateType"));
         if (StringUtils.isBlank(businessInfoDTO.getId())) { // 如果是发起时保存
             businessInfoDTO.setId(UUIDUtils.randomUUID20());
-            businessInfoDTO.setBusinessJson(JSON.toJSONString(businessInfoDTO.getBusinessMap()));
             save(businessInfoDTO);
         } else { // 如果是审批时保存
             businessInfoDTO.setBusinessJson(JSON.toJSONString(businessInfoDTO.getBusinessMap()));