Explorar o código

更改了sql 过滤掉company里面删除的记录

ly hai 1 ano
pai
achega
1a8781113e

+ 1 - 1
src/main/resources/mybatis/business/BizFinancialIndividualIncomeTaxMapper.xml

@@ -66,7 +66,7 @@
         left join biz_tenant t8 on t8.id = t9.to_tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             f.deleted = 0
-            AND c.is_zero=0
+            AND c.is_zero = 0 and c.deleted = 0
             <if test="currentEmployeeId != null ">AND current_employee_id = #{currentEmployeeId}</if>
             <if test="principal != null and principal != ''">
                 AND (c.leader_id=#{principal} OR c.adviser_id=#{principal})

+ 1 - 1
src/main/resources/mybatis/business/BizFinancialKeepAccountMapper.xml

@@ -54,7 +54,7 @@
         left join biz_entrust t9 on t9.work_order_id = t1.work_order_id and t9.deleted = 0 and  date_format(t9.current_month, '%Y%m') = concat(#{year}, #{month})
         left join biz_tenant t8 on t8.id = t9.to_tenant_id
         WHERE
-        t1.deleted = 0 and t1.is_stop = 0
+        t1.deleted = 0 and t1.is_stop = 0 and t2.deleted = 0
         <if test="id != null">
             AND t1.id = #{id}
         </if>

+ 1 - 1
src/main/resources/mybatis/business/BizFinancialReceiveTicketMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join biz_entrust t7 on t7.work_order_id = t1.work_order_id and t7.deleted = 0 and  date_format(t7.current_month, '%Y%m') = concat(#{year}, #{month})
         left join biz_tenant t8 on t8.id = t7.to_tenant_id
         WHERE
-        t1.deleted = 0
+        t1.deleted = 0 and t2.deleted = 0
         <if test="id != null">
             AND t1.id = #{id}
         </if>

+ 1 - 1
src/main/resources/mybatis/business/BizFinancialReportTaxNonZeroMapper.xml

@@ -40,7 +40,7 @@
         <!--        left join fxy_financial_checkout t3 on t3.account_sets_id = t1.account_sets_id-->
         WHERE
         t1.deleted = 0 and t1.is_stop = 0
-        AND t2.is_zero = 0
+        AND t2.is_zero = 0 and t2.deleted = 0
         <if test="id != null">
             AND t1.id = #{id}
         </if>

+ 1 - 1
src/main/resources/mybatis/business/BizFinancialSalaryMapper.xml

@@ -37,7 +37,7 @@
 
 
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            t1.deleted = 0 and t1.is_stop = 0
+            t1.deleted = 0 and t1.is_stop = 0 and t2.deleted = 0
 
             <if test="isStop != null ">AND is_stop = #{isStop}</if>
             <if test="companyName != null ">AND t2.name like concat('%', #{companyName}, '%')</if>