修改联建单位-简要信息列表

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

@@ -600,8 +600,14 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     @Override
     public PageData getListbrief(PartyUnitListbriefFormDTO form) {
+        Result<Map<String, String>> unitTypeMap = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
         PageHelper.startPage(form.getPageNo(), form.getPageSize());
         List<PartyUnitListbrieResultDTO> dto = baseDao.getListbrief(form, form.getCustomerId());
+
+        dto.forEach(item -> {
+            item.setType(unitTypeMap.getData().get(item.getType()));
+        });
+
         // 获取gridName
         /*for (PartyUnitListbrieResultDTO item : dto) {
             if (StringUtils.isNotEmpty(item.getGridId())) {

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

@@ -86,8 +86,8 @@
 --             AND b.DEL_FLAG = '0'
         <where>
             a.DEL_FLAG = '0'
-            AND a.AGENCY_ID = #{form.agencyId}
             AND a.CUSTOMER_ID = #{customerId}
+            AND (AGENCY_ID = #{form.agencyId} OR PIDS LIKE concat( '%', #{form.agencyId}, '%' ))
 <!--            <if test="gridId != null and gridId != ''">-->
 <!--                AND b.GRID_ID = #{form.gridId}-->
 <!--            </if>-->