Commit 5c99910e authored by hongguangwu's avatar hongguangwu

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

parents db86ee4f 057b11e0
......@@ -453,6 +453,12 @@
<if test="searchVo.salaryMonthEnd != null and searchVo.salaryMonthEnd.trim() != ''">
AND a.SALARY_MONTH <![CDATA[<=]]> #{searchVo.salaryMonthEnd}
</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">
AND (a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5)
</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