社保公积金查询，整合社保与公积金的项目、单位；

yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml

@@ -265,9 +265,9 @@
                 a.EMP_IDCARD,
                 a.EMP_TYPE,
                 a.SETTLE_DOMAIN,
-				a.SETTLE_DOMAIN_CODE,
-                a.SETTLE_DOMAIN_NAME,
-                a.UNIT_NAME,
+                concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,"")) SETTLE_DOMAIN_CODE,
+				concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if(a.SETTLE_DOMAIN_NAME is null or a.SETTLE_DOMAIN_NAME_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_NAME_FUND,"")) SETTLE_DOMAIN_NAME,
+				concat(ifnull(a.UNIT_NAME,""),if(a.UNIT_NAME is null or a.UNIT_NAME_FUND is null,"",","),ifnull(a.UNIT_NAME_FUND,"")) UNIT_NAME,
                 a.UNIT_ID,
  				a.SETTLE_DOMAIN_FUND,
 				a.SETTLE_DOMAIN_CODE_FUND,
@@ -418,10 +418,10 @@
 				AND a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain}
 			</if>
 			<if test="tSocialFundInfo.settleDomainName != null and tSocialFundInfo.settleDomainName.trim() != ''">
-				AND a.SETTLE_DOMAIN_NAME = #{tSocialFundInfo.settleDomainName}
+				AND (a.SETTLE_DOMAIN_NAME = #{tSocialFundInfo.settleDomainName} or a.SETTLE_DOMAIN_NAME_FUND = #{tSocialFundInfo.settleDomainName})
 			</if>
 			<if test="tSocialFundInfo.unitName != null and tSocialFundInfo.unitName.trim() != ''">
-				AND a.UNIT_NAME = #{tSocialFundInfo.unitName}
+				AND (a.UNIT_NAME = #{tSocialFundInfo.unitName} or a.UNIT_NAME_FUND = #{tSocialFundInfo.unitName})
 			</if>
 			<if test="tSocialFundInfo.unitId != null and tSocialFundInfo.unitId.trim() != ''">
 				AND a.UNIT_ID = #{tSocialFundInfo.unitId}
@@ -790,8 +790,9 @@
 			a.EMP_IDCARD,
 			a.EMP_TYPE,
 			d.EMP_MOBILE,
-			a.UNIT_NAME,
-			a.SETTLE_DOMAIN_NAME,
+		concat(ifnull(a.SETTLE_DOMAIN_CODE,""),if(a.SETTLE_DOMAIN_CODE is null or a.SETTLE_DOMAIN_CODE_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_CODE_FUND,"")) SETTLE_DOMAIN_CODE,
+		concat(ifnull(a.SETTLE_DOMAIN_NAME,""),if(a.SETTLE_DOMAIN_NAME is null or a.SETTLE_DOMAIN_NAME_FUND is null,"",","),ifnull(a.SETTLE_DOMAIN_NAME_FUND,"")) SETTLE_DOMAIN_NAME,
+		concat(ifnull(a.UNIT_NAME,""),if(a.UNIT_NAME is null or a.UNIT_NAME_FUND is null,"",","),ifnull(a.UNIT_NAME_FUND,"")) UNIT_NAME,
 			d.ID_CARD_PROVINCE,
 			d.ID_CARD_CITY,
 			d.ID_CARD_TOWN,