|
@@ -50,15 +50,15 @@
|
|
|
)
|
|
|
</if>
|
|
|
<if test="status != null and status != 0">
|
|
|
- AND exists (select 1 from biz_financial_salary_detail fsd where fsd.financial_salary_id = t1.id and
|
|
|
+ AND exists (select 1 from biz_financial_salary_detail fsd where fsd.deleted = 0 and fsd.financial_salary_id = t1.id and
|
|
|
fsd.month = #{month} and fsd.year = #{year} and fsd.status = #{status})
|
|
|
</if>
|
|
|
<if test="status != null and status == 0">
|
|
|
- AND not exists (select 1 from biz_financial_salary_detail fsd where fsd.financial_salary_id = t1.id and
|
|
|
+ AND not exists (select 1 from biz_financial_salary_detail fsd where fsd.deleted = 0 and fsd.financial_salary_id = t1.id and
|
|
|
fsd.month = #{month} and fsd.year = #{year})
|
|
|
</if>
|
|
|
<if test="hasIndividualIncomeTax != null">
|
|
|
- AND exists (select 1 from biz_financial_salary_detail fsd where fsd.financial_salary_id = t1.id and
|
|
|
+ AND exists (select 1 from biz_financial_salary_detail fsd where fsd.deleted = 0 and fsd.financial_salary_id = t1.id and
|
|
|
has_individual_income_tax=#{hasIndividualIncomeTax} and fsd.month = #{month} and fsd.year = #{year})
|
|
|
</if>
|
|
|
</if>
|