启用停用、维修告知、设备移交、移装告知列表修改

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

@@ -55,7 +55,7 @@
             <if test="dto.applyType != null and dto.applyType != ''">
                 and  jed.apply_type = #{dto.applyType}
             </if>
-            or jed.transfer_to_user_ids like concat('%',#{userId},'%')
+            OR (jed.transfer_to_user_ids like concat('%',#{userId},'%') AND jed.is_delete = 0 )
         </where>
         order by jed.rec_date desc
     </select>

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

@@ -106,7 +106,7 @@
                     </if>
                 </otherwise>
             </choose>
-            and (1=1 or jet.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
+            OR (jet.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) AND jet.is_delete = 0  )
         </where>
         ORDER BY jet.apply_date DESC
     </select>

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

@@ -48,7 +48,7 @@
             <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
-            or isn.transfer_to_user_ids like concat('%',#{userId},'%')
+            OR (isn.transfer_to_user_ids like concat('%',#{userId},'%') AND isn.is_delete = 0 )
         </where>
         ORDER BY
         isn.apply_no DESC

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

@@ -68,7 +68,7 @@
             <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
-            and (1=1 or isn.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
+            OR (isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) AND isn.is_delete = 0  )
         </where>
         ORDER BY
         isn.apply_no DESC