修改bug

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/commonservice/impl/AreaCodeServiceImpl.java

@@ -39,7 +39,7 @@ public class AreaCodeServiceImpl implements AreaCodeService {
     public List<NextAreaCodeResultDTO> queryNextLevelAreaCodeList(NextAreaCodeFormDTO formDTO) {
         List<NextAreaCodeResultDTO> list = new ArrayList<>();
         NextAreaCodeResultDTO other = new NextAreaCodeResultDTO();
-        other.setAreaCode("other");
+        other.setAreaCode("others");
         other.setAreaName("其它");
         switch (formDTO.getLevel()) {
             /**

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java

@@ -250,24 +250,28 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
             //数据分析还是沿用原来的
             menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName);
         }
-        Result<Boolean> isRootManager = epmetUserOpenFeignClient.getIsRootManager(tokenDto.getUserId());
+        List<GovMenuDTO> govMenuDTOS = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
-        if (!isRootManager.success()){
+        return TreeUtils.buildTree(govMenuDTOS);
-            throw new EpmetException("getIsRootManager method is failure");
+
-        }
+        //TODO: rongchao 注释掉的  后面需要初始化
-        if (isRootManager.getData()){
+//        Result<Boolean> isRootManager = epmetUserOpenFeignClient.getIsRootManager(tokenDto.getUserId());
-            List<GovMenuDTO> govMenuDTOS = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
+//        if (!isRootManager.success()){
-            return TreeUtils.buildTree(govMenuDTOS);
+//            throw new EpmetException("getIsRootManager method is failure");
-        }
+//        }
-        /*for(GovMenuEntity m:menuList){
+//        if (isRootManager.getData()){
-            if("ic_resi_add".equals(m.getPermissions())){
+//            List<GovMenuDTO> govMenuDTOS = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
-                logger.info("1、菜单返回了新增居民");
+//            return TreeUtils.buildTree(govMenuDTOS);
-            }
+//        }
-        }*/
+//        /*for(GovMenuEntity m:menuList){
-        disposeGovMenu(menuList,tokenDto.getUserId());
+//            if("ic_resi_add".equals(m.getPermissions())){
-        Map<Boolean, List<GovMenuEntity>> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus));
+//                logger.info("1、菜单返回了新增居民");
-        List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class);
+//            }
-        List<GovMenuDTO> govMenuDTOS = TreeUtils.buildTree(dtoList);
+//        }*/
-        return govMenuDTOS;
+//        disposeGovMenu(menuList,tokenDto.getUserId());
+//        Map<Boolean, List<GovMenuEntity>> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus));
+//        List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class);
+//        List<GovMenuDTO> govMenuDTOS = TreeUtils.buildTree(dtoList);
+//        return govMenuDTOS;
     }
 
     /**