浏览代码

fix:解除合同的判断

ly 11 月之前
父节点
当前提交
d49e16f531
共有 1 个文件被更改,包括 1 次插入4 次删除
  1. 1 4
      src/main/resources/mybatis/business/BizWorkOrderMapper.xml

+ 1 - 4
src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -60,7 +60,7 @@
         left join biz_tenant t10 on t10.id = t9.from_tenant_id
         LEFT JOIN biz_archive_input t11 ON t11.id = t1.contract_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            t1.deleted = 0
+            t1.deleted = 0 and t11.dissolution = 0
             <if test="id != null ">AND t1.id = #{id}</if>
             <if test="tenantId != null ">
                 AND exists (select 1 from biz_entrust eb
@@ -69,9 +69,6 @@
                 and eb.work_order_id = t1.id
                 )
             </if>
-            <if test="contractId != null ">
-                and t11.dissolution = 1
-            </if>
             <if test="taskTypeName != null">
                 AND (CONCAT( t3.name,"-", t4.name) LIKE concat('%', #{taskTypeName}, '%') OR t1.remark LIKE concat('%',#{taskTypeName}, '%')
                 OR CONCAT(t3.name,"-",t6.alter_type,"-",t4.name) LIKE concat('%', #{taskTypeName}, '%'))