ly 1 年間 前
コミット
c2756f71a1

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feedbackContent != null  and feedbackContent != ''"> AND t1.feedback_content = #{feedbackContent}</if>
             <if test="hasIndividualIncomeTax != null "> AND t1.has_individual_income_tax = #{hasIndividualIncomeTax}</if>
             <if test="number != null "> AND t1.number = #{number}</if>
-            <if test="amount != null "> AND t1.amount = #{amount}</if>
+<!--            <if test="amount != null "> AND t1.amount = #{amount}</if>-->
         </trim>
     </select>
 

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

@@ -20,6 +20,7 @@
         left join biz_tenant t3 on t3.id = t1.tenant_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
+            and t1.is_stop = 0
             <if test="isStop != null ">AND is_stop = #{isStop}</if>
             <if test="companyName != null ">AND t2.name like concat('%', #{companyName}, '%')</if>
             <if test="taxType != null and taxType != ''">