Merge remote-tracking branch 'remotes/origin/dev_zhili'

# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
#	epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java

@@ -97,7 +97,7 @@ public interface IcPartyUnitDao extends BaseDao<IcPartyUnitEntity> {
      * @author zxc
      * @date 2022/5/18 13:48
      */
-    List<PartyUnitListResultDTO> getAssistanceUnitList(@Param("agencyId")String agencyId);
+    List<PartyUnitListResultDTO> getAssistanceUnitList(@Param("agencyId")String agencyId,@Param("pid")String pid);
 
     /**
      * 联建单位-简要信息列表

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@@ -42,6 +42,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelPoiUtils;
@@ -633,7 +634,11 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         if (null == staffInfo){
             throw new EpmetException("未查询到此工作人员信息"+tokenDto.getUserId());
         }
-        return baseDao.getAssistanceUnitList(staffInfo.getAgencyId());
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+        if (null == agencyInfo){
+            throw new EpmetException("未查询到此组织信息"+staffInfo.getAgencyId());
+        }
+        return baseDao.getAssistanceUnitList(staffInfo.getAgencyId(),agencyInfo.getPid());
     }
 
     @Override

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml

@@ -164,7 +164,7 @@
                     CREATED_TIME
                 FROM ic_party_unit
                 WHERE DEL_FLAG = '0'
-                    AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
+                  AND AGENCY_ID IN (#{pid},#{agencyId})
                 UNION ALL
                 SELECT
                     ID AS assistanceUnitId,