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

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

@@ -332,6 +332,7 @@
 		<result property="sendMonth" column="SEND_MONTH"/>
 		<result property="deptName" column="DEPT_NAME"/>
 		<result property="deptNo" column="DEPT_NO"/>
+		<result property="applyNo" column="APPLY_NO"/>
 		<result property="settlementAmount" column="SETTLEMENT_AMOUNT"/>
 		<result property="invoiceTitle" column="INVOICE_TITLE"/>
 		<result property="createName" column="CREATE_NAME"/>
@@ -346,6 +347,7 @@
 		a.SEND_MONTH,
 		a.DEPT_NAME,
 		a.DEPT_NO,
+		a.APPLY_NO,
 		a.SETTLEMENT_AMOUNT,
 		a.ID,
 		a.DEPT_ID,
@@ -432,6 +434,9 @@
 			<if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''">
 				AND a.DEPT_NO = #{searchVo.deptNo}
 			</if>
+			<if test="searchVo.applyNo != null and searchVo.applyNo.trim() != ''">
+				AND a.APPLY_NO like concat('%',#{searchVo.applyNo},'%')
+			</if>
 			<if test="searchVo.salaryMonth != null and searchVo.salaryMonth.trim() != ''">
 				AND a.SALARY_MONTH = #{searchVo.salaryMonth}
 			</if>