Skip to content

Y
yifu-mvp
Commit 5c99910e authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.2' into MVP1.2

parents db86ee4f 057b11e0
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @ 5c99910e
...@@ -453,6 +453,12 @@ ...@@ -453,6 +453,12 @@
<if test="searchVo.salaryMonthEnd != null and searchVo.salaryMonthEnd.trim() != ''"> <if test="searchVo.salaryMonthEnd != null and searchVo.salaryMonthEnd.trim() != ''">
AND a.SALARY_MONTH <![CDATA[<=]]> #{searchVo.salaryMonthEnd} AND a.SALARY_MONTH <![CDATA[<=]]> #{searchVo.salaryMonthEnd}
</if> </if>
<if test="searchVo.createTimeStart != null">
AND a.CREATE_TIME <![CDATA[ >= ]]> #{searchVo.createTimeStart}
</if>
<if test="searchVo.createTimeEnd != null">
AND a.CREATE_TIME <![CDATA[ <= ]]> #{searchVo.createTimeEnd}
</if>
<!--<if test="searchVo.status == null"> <!--<if test="searchVo.status == null">
AND (a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5) AND (a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5)
</if>--> </if>-->
......
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