Skip to content

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

Merge remote-tracking branch 'origin/develop' into develop

parents ed8c24bd e92d3241
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @ a8d50a54
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
<sql id="where_page"> <sql id="where_page">
<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},'%')
</if> </if>
<if test="tSalaryStandard.deptNo != null and tSalaryStandard.deptNo.trim() != ''"> <if test="tSalaryStandard.deptNo != null and tSalaryStandard.deptNo.trim() != ''">
AND a.DEPT_NO = #{tSalaryStandard.deptNo} AND a.DEPT_NO = #{tSalaryStandard.deptNo}
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
<sql id="where_export"> <sql id="where_export">
<if test="searchVo != null"> <if test="searchVo != null">
<if test="searchVo.deptName != null and searchVo.deptName.trim() != ''"> <if test="searchVo.deptName != null and searchVo.deptName.trim() != ''">
AND a.DEPT_NAME like concat(#{'%',#{searchVo.deptName},'%') AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%')
</if> </if>
<if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''"> <if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''">
AND a.DEPT_NO = #{searchVo.deptNo} AND a.DEPT_NO = #{searchVo.deptNo}
......
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