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

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -294,7 +294,7 @@
 	<sql id="where_page">
 		<if test="tSalaryStandard != null">
 			<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 test="tSalaryStandard.deptNo != null and tSalaryStandard.deptNo.trim() != ''">
 				AND a.DEPT_NO = #{tSalaryStandard.deptNo}
@@ -313,7 +313,7 @@
 	<sql id="where_export">
 		<if test="searchVo != null">
 			<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 test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''">
 				AND a.DEPT_NO = #{searchVo.deptNo}