From 53e3cdef1344b4029d491c78a9bd7ce16a47f7e0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 23 Jan 2024 09:50:02 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectStandardService.java       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 97740f64..ddbbc0cf 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
@@ -544,12 +544,18 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
             String termId = term.getId();
             String assessResults = term.getAssessResults();
             String designEngineer = term.getDesignEngineer();
-            term1.setId(termId);
-            term1.setAssessResults(assessResults);
-            term1.setDesignEngineer(designEngineer);
             if (!pass){
                 continue;
             }
+            term1.setId(termId);
+            term1.setAssessResults(assessResults);
+            if(StringUtils.isBlank(designEngineer)){
+                designEngineer = term.getModuleOwner();
+            }
+            if(StringUtils.isBlank(designEngineer)){
+                designEngineer = term.getResponsibleUnitLeader();
+            }
+            term1.setDesignEngineer(designEngineer);
             updateTermList.add(term1);
             carbonCopyPersonnelList.addAll(Arrays.asList(term.getCarbonCopyPersonnels().split(",")));