日志查询接口权限控制

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/MenuController.java

@@ -2,10 +2,8 @@ package com.gic.auth.web.controller;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import com.gic.auth.constant.MenuProjectConstants;
 import com.gic.log.api.dto.LogSearchDTO;
@@ -194,7 +192,8 @@ public class MenuController {
             result = menuApiService.listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
         } else {
             //权限控制
-            result = menuApiService.getUserMenuOfAppNotTree(userDetail.getEnterpriseId(), userDetail.getUserId(), null, null);
+            result = menuApiService.getUserMenuOfAppNotTree(userDetail.getEnterpriseId(), userDetail.getUserId(), null,
+                    null);
         }
         if (result.isSuccess()) {
             return RestResponse
@@ -227,6 +226,32 @@ public class MenuController {
             searchParam.setRelationId(Long.valueOf(menuId));
         } else {
             //权限控制
+            List<Long> relationIdList = new ArrayList<>();
+            UserDetail userDetail = UserDetailUtils.getUserDetail();
+            //权限控制
+            ServiceResponse<List<MenuDTO>> gicResult = menuApiService.getUserMenuOfGicNotTree(
+                    userDetail.getEnterpriseId(), userDetail.getUserId(), null,
+                    userDetail.getEnterpriseInfo().getVersionCode());
+            if (gicResult.isSuccess()) {
+                List<MenuDTO> gicMenuList = gicResult.getResult();
+                relationIdList.addAll(Optional.ofNullable(gicMenuList).orElse(new ArrayList<>()).stream()
+                        .mapToLong(e -> e.getMenuId()).boxed().collect(Collectors.toList()));
+            }
+            boolean isSuperAdmin = userDetail.getUserInfo().getSuperAdmin().intValue() == 1;
+            ServiceResponse<List<MenuDTO>> appResult;
+            if (isSuperAdmin) {
+                appResult = menuApiService.listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
+            } else {
+                //权限控制
+                appResult = menuApiService.getUserMenuOfAppNotTree(userDetail.getEnterpriseId(), userDetail.getUserId(),
+                        null, null);
+            }
+            if (appResult.isSuccess()) {
+                List<MenuDTO> appMenuList = appResult.getResult();
+                relationIdList.addAll(Optional.ofNullable(appMenuList).orElse(new ArrayList<>()).stream()
+                        .mapToLong(e -> e.getMenuId()).boxed().collect(Collectors.toList()));
+            }
+            searchParam.setRelationIdList(relationIdList);
         }
         SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
         if (StringUtils.isNotBlank(startTime)) {