安装告知、移装告知 列表查询BUG修改

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

@@ -35,7 +35,6 @@
         LEFT JOIN idx_biz_jg_use_info ibjui on insEq.equ_id = ibjui.RECORD
         <where>
             isn.is_delete = false
-            AND (1=1 or isn.transfer_to_user_ids like concat('%',#{param.transferToUserIds},'%'))
             <if test="param != null ">
                 <if test="param.applyNo != null and param.applyNo != ''">
                     AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
@@ -66,6 +65,7 @@
                 or
                 AND isn.install_unit_credit_code = #{orgCode})
             </if>
+            or (isn.is_delete = false and isn.transfer_to_user_ids like concat('%',#{param.transferToUserIds},'%'))
         </where>
         ORDER BY
         isn.create_date DESC

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

@@ -39,7 +39,6 @@
             left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
         <where>
             tjtn.is_delete = false
-            AND (1=1 or tjtn.transfer_to_user_ids like concat('%',#{param.transferToUserIds},'%'))
             <if test="param != null ">
                 <if test="param.applyNo != null and param.applyNo != ''">
                     AND tjtn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
@@ -88,6 +87,7 @@
                 or
                 AND tjtn.install_unit_credit_code = #{orgCode})
             </if>
+            or (tjtn.is_delete = false and tjtn.transfer_to_user_ids like concat('%',#{param.transferToUserIds},'%'))
         </where>
         ORDER BY
         tjtn.apply_no DESC