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

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TBankSet.java

@@ -52,9 +52,9 @@ public class TBankSet extends BaseEntity {
 	/**
 	 * bankName
 	 */
-	@ExcelAttribute(name = "开户行", isNotEmpty = true, errorInfo = "开户行不能为空", maxLength = 50)
+	@ExcelAttribute(name = "开户行", isNotEmpty = true, errorInfo = "开户行不能为空", maxLength = 100)
 	@NotBlank(message = "开户行不能为空")
-	@Length(max = 50, message = "开户行不能超过50个字符")
+	@Length(max = 100, message = "开户行不能超过100个字符")
 	@ExcelProperty("开户行")
 	@Schema(description = "开户行")
 	private String bankName;

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

@@ -47,7 +47,7 @@
 				AND a.ID = #{tBankSet.id}
 			</if>
 			<if test="tBankSet.bankName != null and tBankSet.bankName.trim() != ''">
-				AND a.BANK_NAME = #{tBankSet.bankName}
+				AND a.BANK_NAME like concat('%', #{tBankSet.bankName},'%')
 			</if>
 			<if test="tBankSet.createBy != null and tBankSet.createBy.trim() != ''">
 				AND a.CREATE_BY = #{tBankSet.createBy}