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

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

@@ -239,10 +239,10 @@
 				AND a.CONTRACT_END = #{tEmployeeContractInfo.contractEnd}
 			</if>
 			<if test="tEmployeeContractInfo.subjectDepart != null and tEmployeeContractInfo.subjectDepart.trim() != ''">
-				AND a.SUBJECT_DEPART = #{tEmployeeContractInfo.subjectDepart}
+				AND a.SUBJECT_DEPART like concat('%',#{tEmployeeContractInfo.subjectDepart},'%')
 			</if>
 			<if test="tEmployeeContractInfo.subjectUnit != null and tEmployeeContractInfo.subjectUnit.trim() != ''">
-				AND a.SUBJECT_UNIT = #{tEmployeeContractInfo.subjectUnit}
+				AND a.SUBJECT_UNIT like concat('%',#{tEmployeeContractInfo.subjectUnit},'%')
 			</if>
 			<if test="tEmployeeContractInfo.situation != null and tEmployeeContractInfo.situation.trim() != ''">
 				AND a.SITUATION = #{tEmployeeContractInfo.situation}
@@ -374,7 +374,7 @@
 				AND a.EMP_NATRUE = #{tEmployeeContractInfo.empNatrue}
 			</if>
 			<if test="tEmployeeContractInfo.contractParty != null and tEmployeeContractInfo.contractParty.trim() != ''">
-				AND a.CONTRACT_PARTY = #{tEmployeeContractInfo.contractParty}
+				AND a.CONTRACT_PARTY like concat('%',#{tEmployeeContractInfo.contractParty},'%')
 			</if>
 			<if test="tEmployeeContractInfo.contractSubName != null and tEmployeeContractInfo.contractSubName.trim() != ''">
 				AND a.CONTRACT_SUB_NAME = #{tEmployeeContractInfo.contractSubName}