From c5968f004e493498a12f41c0f06296e9bf64b899 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 27 Oct 2023 09:29:26 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E6=B5=81=E7=A8=8B=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/esInitChange/entity/vo/InitChangeDataVO.java    | 6 +++++-
 .../service/impl/ProcessEsInitChangeServiceImpl.java        | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeDataVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeDataVO.java
index 200ee078..2b02f945 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeDataVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeDataVO.java
@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.esInitChange.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
 import lombok.Data;
@@ -13,9 +14,12 @@ import java.util.List;
 @Data
 public class InitChangeDataVO {
 
+    @JsonProperty("common")
     CommonVO commonVO;
 
+    @JsonProperty("dataList")
     List<ProcessEsInitChange> dataList;
 
-    InitChangeFlowUserVO initChangeFlowUserVO;
+    @JsonProperty("flowUser")
+    InitChangeFlowUserVO flowUserInfoVO;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 5ba89f8b..d1220305 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -105,7 +105,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         initChangeFlowUserVO.setNewMainDraftUserLeaderLeader(userMap.get("newMainDraftUserLeaderLeader").getLinkUserIds());
         initChangeFlowUserVO.setNewMainDraftUserLeader(userMap.get("newMainDraftUserLeader").getLinkUserIds());
         initChangeFlowUserVO.setCopyUser(userMap.get("copyUser").getLinkUserIds());
-        initChangeDataVO.setInitChangeFlowUserVO(initChangeFlowUserVO);
+        initChangeDataVO.setFlowUserInfoVO(initChangeFlowUserVO);
         return initChangeDataVO;
     }
 
@@ -238,7 +238,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     }
 
     public Map<String, Object> setVariables(InitChangeDataVO initChangeData) {
-        InitChangeFlowUserVO initChangeFlowUserVO = initChangeData.getInitChangeFlowUserVO();
+        InitChangeFlowUserVO initChangeFlowUserVO = initChangeData.getFlowUserInfoVO();
         ProcessEsInitChange initChange = initChangeData.getDataList().get(0);
         Map<String, Object> map = new HashMap<>();
         // 设置流程中各个节点的人