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

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

@@ -116,7 +116,7 @@
                         AND a.DEPT_ID = #{tSalaryEmployee.deptId}
                     </if>
                     <if test="tSalaryEmployee.deptName != null and tSalaryEmployee.deptName.trim() != ''">
-                        AND a.DEPT_NAME = #{tSalaryEmployee.deptName}
+                        AND a.DEPT_NAME like concat('%',#{tSalaryEmployee.deptName},'%')
                     </if>
                     <if test="tSalaryEmployee.deptNo != null and tSalaryEmployee.deptNo.trim() != ''">
                         AND a.DEPT_NO = #{tSalaryEmployee.deptNo}
@@ -146,7 +146,7 @@
                         AND a.BANK_NO = #{tSalaryEmployee.bankNo}
                     </if>
                     <if test="tSalaryEmployee.invoiceTitle != null and tSalaryEmployee.invoiceTitle.trim() != ''">
-                        AND a.INVOICE_TITLE = #{tSalaryEmployee.invoiceTitle}
+                        AND a.INVOICE_TITLE like concat('%',#{tSalaryEmployee.invoiceTitle},'%')
                     </if>
                     <if test="tSalaryEmployee.bankProvince != null">
                         AND a.BANK_PROVINCE = #{tSalaryEmployee.bankProvince}

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

@@ -140,8 +140,11 @@
 						AND a.ORDER_ID = #{tSalaryStandard.orderId}
 					</if>
                     <if test="tSalaryStandard.deptName != null and tSalaryStandard.deptName.trim() != ''">
-                        AND a.DEPT_NAME = #{tSalaryStandard.deptName}
+                        AND a.DEPT_NAME like concat('%',#{tSalaryStandard.deptName},'%')
                     </if>
+					<if test="tSalaryStandard.invoiceTitle != null and tSalaryStandard.invoiceTitle.trim() != ''">
+						AND a.INVOICE_TITLE like concat('%',#{tSalaryStandard.invoiceTitle},'%')
+					</if>
                     <if test="tSalaryStandard.deptNo != null and tSalaryStandard.deptNo.trim() != ''">
                         AND a.DEPT_NO = #{tSalaryStandard.deptNo}
                     </if>