update 法规合规评估流程

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);
 }

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>

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);
                 }