xin kai

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java

@@ -114,6 +114,12 @@ public class GovMenuController {
 		return new Result<List<GovMenuDTO>>().ok(list);
 	}
 
+	@GetMapping("navDigitalCommunity")
+	public Result<List<GovMenuDTO>> navDigitalCommunity(@LoginUser TokenDto tokenDto, String tableName){
+		List<GovMenuDTO> list = govMenuService.navDigitalCommunity(tokenDto,tableName);
+		return new Result<List<GovMenuDTO>>().ok(list);
+	}
+
 	/**
 	 * 权限标识
 	 * @param tokenDto token

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

@@ -129,6 +129,7 @@ public interface GovMenuService extends BaseService<GovMenuEntity> {
      * @return java.util.List<GovMenuDTO>
      */
     List<GovMenuDTO> getUserMenuNavList(TokenDto tokenDto, String tableName);
+    List<GovMenuDTO> navDigitalCommunity(TokenDto tokenDto, String tableName);
 
     /**
      * 获取用户权限标识

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

@@ -231,6 +231,16 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
         return getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(),tableName,tokenDto.getUserId());
     }
 
+    @Override
+    public List<GovMenuDTO> navDigitalCommunity(TokenDto tokenDto, String tableName) {
+        tableName = getTableName(tableName);
+        List<GovMenuEntity> menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName);
+        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;
+    }
+
     /**
      * 获取客户，配置的 菜单信息
      *
@@ -247,8 +257,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
             return  govMenuDTOS;
         }
         List<GovMenuEntity> menuList = baseDao.getCustomerMenuList(customerId, type, HttpContextUtils.getLanguage(),tableName);
-        Map<Boolean, List<GovMenuEntity>> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus));
+        List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
-        List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class);
         govMenuDTOS = TreeUtils.buildTree(dtoList);
         govCustomerMenuRedis.setCustomerMenuList(customerId,type,govMenuDTOS,tableName);
         return govMenuDTOS;