From 02b39f9091e89589d5b4fed039577290f0858b3c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 18 Jan 2024 15:47:13 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProcessProjectStandardTermMapper.java       |  2 ++
 .../mapper/xml/ProcessProjectStandardTermMapper.xml    | 10 ++++++++++
 .../service/ProcessProjectStandardService.java         |  4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java
index 2c24c6b4..d9f6c533 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java
@@ -19,4 +19,6 @@ public interface ProcessProjectStandardTermMapper extends BaseMapper<ProcessProj
     List<ProcessProjectStandardTerm> getByDesignEngineer(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId);
 
     List<ProcessProjectStandardTerm> getByStandardsEngineer(@Param("processId") String processId);
+
+    List<ProcessProjectStandardTerm> getByTermDesignEngineer(@Param("processId") String processId, @Param("originUserId") String originUserId);
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
index 42398a1e..602c542f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
@@ -119,4 +119,14 @@
     where ppst.process_id = #{processId}
     and ppstu.id is not null
   </select>
+
+  <select id="getByTermDesignEngineer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List">
+      <property name="alias" value="ppst"/>
+    </include>
+    from process_project_standard_term ppst
+    where ppst.process_id = #{processId}
+    and ppst.design_engineer = #{originUserId}
+  </select>
 </mapper>
\ No newline at end of file
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 9dbeead3..7b41a788 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
@@ -179,7 +179,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 break;
             //设计工程师补充工作令编号
             case ProcessProjectStandardCommon.SJGCSBCGZLBH:
-                processProjectStandardTermList = termMapper.getByStandardsEngineer(processId);
+                processProjectStandardTermList = termMapper.getByTermDesignEngineer(processId, originUserId);
 
                 break;
 
@@ -539,7 +539,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                 updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved);
                 updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_INVOLVED);
             }else {
-                String moduleOwner = termUser.getModuleOwner();
+                String moduleOwner = term.getModuleOwner();
                 if (StringUtils.isBlank(moduleOwner)){
                     throw new JeroBootException(ResultCommon.PARAMETER_NOT_RECOGNIZED);
                 }