Commit fbe4974c authored by huyuchen's avatar huyuchen

稿酬导入修改

parent a543d938
...@@ -272,6 +272,7 @@ ...@@ -272,6 +272,7 @@
FROM t_salary_standard a FROM t_salary_standard a
<where> <where>
1=1 1=1
AND a.DELETE_FLAG = 0
<if test="tSalaryStandard != null"> <if test="tSalaryStandard != null">
<if test="tSalaryStandard.deptName != null and tSalaryStandard.deptName.trim() != ''"> <if test="tSalaryStandard.deptName != null and tSalaryStandard.deptName.trim() != ''">
AND a.DEPT_NAME like concat(#{'%',#{tSalaryStandard.deptName},'%') AND a.DEPT_NAME like concat(#{'%',#{tSalaryStandard.deptName},'%')
...@@ -283,7 +284,7 @@ ...@@ -283,7 +284,7 @@
AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth} AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth}
</if> </if>
<if test="tSalaryStandard.status == null"> <if test="tSalaryStandard.status == null">
AND a.STATUS = 1 OR a.STATUS = 2 AND a.STATUS = 1 OR a.STATUS = 2 or a.STATUS = 5
</if> </if>
<if test="tSalaryStandard.status != null"> <if test="tSalaryStandard.status != null">
AND a.STATUS = #{tSalaryStandard.status} AND a.STATUS = #{tSalaryStandard.status}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment