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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java

@@ -243,6 +243,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		if (Common.isNotNull(entity.getEmpPhone())) {
 			wrapper.eq(TEmpContractAlert::getEmpPhone, entity.getEmpPhone());
 		}
+		if (Common.isNotNull(entity.getUnitNo())) {
+			wrapper.eq(TEmpContractAlert::getUnitNo, entity.getUnitNo());
+		}
 		return wrapper;
 	}
 	/**

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -230,7 +230,7 @@
 		WHERE 1=1
 		<if test="idNameNoVo != null">
 			<if test="idNameNoVo.name != null and idNameNoVo.name.trim() != ''">
-				and a.CUSTOMER_NAME like concat('%', #{idNameNoVo.name} ,'%')
+				and (a.CUSTOMER_NAME like concat('%', #{idNameNoVo.name} ,'%') or a.CUSTOMER_NO like concat('%', #{idNameNoVo.name} ,'%'))
 			</if>
 			<if test="idNameNoVo.no != null and idNameNoVo.no.trim() != ''">
 				and a.CUSTOMER_NO = #{idNameNoVo.no}