Merge pull request dataease#1665 from dataease/revert-1664-dev

ziyujiahao · web-flow · commit 51ce44c8aec0 · 2022-01-19T19:06:38.000+08:00
Revert "refactor: 去掉无用代码"
diff --git a/backend/src/main/java/io/dataease/mobile/service/DirService.java b/backend/src/main/java/io/dataease/mobile/service/DirService.java
@@ -40,6 +40,7 @@ public List<String> permissions() {
     }
 
     public List<DirItemDTO> query(DirRequest request) {
+//        CurrentUserDto user = AuthUtils.getUser();
         String userId = String.valueOf(AuthUtils.getUser().getUserId());
         List<PanelEntity> panelEntities = new ArrayList<>();
         if (StringUtils.isNotBlank(request.getName())) {
@@ -57,6 +58,17 @@ public List<DirItemDTO> query(DirRequest request) {
             return dirItemDTO;
         }).collect(Collectors.toList());
         return dtos;
+
+//        if (user.getUserId() == 1 && StringUtils.equals("admin", user.getUsername())) {
+//            return dtos;
+//        }
+//        List<String> permissions = proxy().permissions();
+//        return dtos.stream().filter(
+//                dto -> permissions.stream().anyMatch(
+//                        permission -> StringUtils.equals(permission, dto.getId())
+//                )
+//        ).collect(Collectors.toList());
+
     }
 
     public DirService proxy() {
