From d8ec4ae5d0ea6318eca53b27bbe340432efee8a0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 5 Feb 2024 11:04:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081725=20=E6=B3=95=E8=A7=84=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=83=A8?=
 =?UTF-8?q?=E6=89=80=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=EF=BC=8C=E6=A8=A1=E5=9D=97=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=AD=A3=E5=B8=B8=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectstandard/entity/ProcessProjectStandardTerm.java  | 4 ++++
 .../service/ProcessProjectStandardService.java              | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
index 2e3910c5..f00975aa 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
@@ -211,6 +211,10 @@ public class ProcessProjectStandardTerm {
     @ApiModelProperty(value="模块负责人")
     private String moduleOwner;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value="模块负责人")
+    private String moduleOwner_dictText;
+
 
     @TableField(exist = false)
     @ApiModelProperty(value="责任单位联络人")
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index 3af87920..9153d9f7 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -247,14 +247,16 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                     }
                 }
 
-                if (ProcessProjectStandardCommon.BSZGJLDSP_.equals(taskDefinitionKey)){
+                if (ProcessProjectStandardCommon.BSZGJLDSP_1.equals(taskDefinitionKey)
+                    ||ProcessProjectStandardCommon.BSZGJLDSP_2.equals(taskDefinitionKey)
+                        ||ProcessProjectStandardCommon.BSZGJLDSP_3.equals(taskDefinitionKey)){
                     List<String> userNameList = new ArrayList<>();
                     moduleOwnerList.stream()
                             .filter(Objects::nonNull)
                             .distinct().forEach(i ->{
                                 userNameList.add(userNameMap.get(i)) ;
                             });
-                    term.setModuleOwner(String.join(",", userNameList));
+                    term.setModuleOwner_dictText(String.join(",", userNameList));
                 }
                 if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){
                     List<String> userNameList = new ArrayList<>();