维修告知列表修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintainNoticeMapper.java

@@ -27,8 +27,8 @@ public interface JgMaintainNoticeMapper extends CustomBaseMapper<JgMaintainNotic
     Page<JgMaintainNotice> queryForPage(Page<JgMaintainNotice> page,
                                         @Param("param") JgMaintainNoticeDto model,
                                         @Param("type") String type,
-                                        @Param("userId") String userId,
-                                        @Param("orgCode") String orgCode);
+                                        @Param("orgCode") String orgCode,
+                                        @Param("userId") String userId);
 
     /**
      * 根据维修告知编号查询设备、设计、制造等信息

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml

@@ -18,7 +18,6 @@
         LEFT JOIN idx_biz_jg_other_info ibjoi on isneq.equ_id = ibjoi.RECORD
         <where>
             isn.is_delete = 0
-            and isn.transfer_to_user_ids like concat('%',#{userId},'%'))
             <if test="param != null ">
                 <if test="param.applyNo != null and param.applyNo != ''">
                     AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
@@ -49,6 +48,7 @@
             <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
+            or isn.transfer_to_user_ids like concat('%',#{userId},'%')
         </where>
         ORDER BY
         isn.apply_no DESC