1

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

@@ -119,16 +119,17 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
             //获取组织下联建单位
             IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
             unitDTO.setAgencyId(formDTO.getAgencyId());
-            Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
+            // Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel));
             dtoList.forEach(dto -> {
                 //联建单位ID与单位名匹配
                 List<String> unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA));
-                List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
-                if(CollectionUtils.isEmpty(unitNames)){
-                    unitNames=icPartyUnitService.getUnitNames(unitIds);
-                }
+                // List<String> unitNames = unitIds.stream().map(option::get).collect(Collectors.toList());
+                // if(CollectionUtils.isEmpty(unitNames)){
+                List<String> unitNames=icPartyUnitService.getUnitNames(unitIds);
+                // }
                 dto.setUnitIdList(unitIds);
                 dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA));
+                dto.setUnitNameList(unitNames);
                 if (StringUtils.isNotEmpty(dto.getGridId())) {
                     GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId());
                     if (null != gridInfo) {