1.技术监督功能干扰源用户代码提交

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java

@@ -29,7 +29,10 @@ public interface LoadTypeUserManageMapper extends BaseMapper<RLoadTypeUserManage
     Page<RLoadTypeUserManageVO> getLoadTypeUserPage(IPage<RLoadTypeUserManageVO> page,
                                                     @Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam,
                                                     @Param("ids") List<String> ids,
-                                                    @Param("aStatus") String aStatus
+                                                    @Param("aStatus") Integer aStatus,
+                                                    @Param("iStatus") Integer iStatus,
+                                                    @Param("iCheckPerson")String iCheckPerson,
+                                                    @Param("aCheckPerson")String aCheckPerson
                                                     );
 
     /**

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/FlowableAssMapper.xml

@@ -6,6 +6,7 @@
     <select id="selectDeployList" resultType="com.njcn.process.pojo.dto.flowable.FlowProcDefDto">
 
         SELECT
+        ffa.form_id,
         rp.id_ as id,
         rp.deployment_id_ as deploymentId,
         rd.name_ as name,
@@ -17,6 +18,7 @@
         FROM
         act_re_procdef rp
         LEFT JOIN act_re_deployment rd ON rp.deployment_id_ = rd.id_
+        left join flow_form_ass ffa on rp.ID_ = ffa.definition_id
         <where>
             <if test="name != null and name != ''">
                 and rd.name_ like concat('%', #{name}, '%')

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml

@@ -26,8 +26,17 @@
             <if test="param.fileUploadflag != null and param.fileUploadflag != ''">
                 and r.i_is_file_upload = #{param.fileUploadflag}
             </if>
-            <if test="aStatus!= null and aStatus != ''">
-                and r.a_status != #{aStatus}
+            <if test="aStatus!= null">
+                and r.a_status = #{aStatus}
+            </if>
+            <if test="iStatus!= null">
+                and r.i_status = #{iStatus}
+            </if>
+            <if test="iCheckPerson!= null and iCheckPerson != ''">
+                and r.i_check_person = #{iCheckPerson}
+            </if>
+            <if test="aCheckPerson!= null and aCheckPerson != ''">
+                and r.a_check_person = #{aCheckPerson}
             </if>
         </where>
         order by record_time desc