协作人应用权限筛选

gic-platform-auth-api/src/main/java/com/gic/auth/service/MenuApiService.java

@@ -5,6 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.AuthItemListDTO;
 import com.gic.auth.dto.MenuAuthDepartDTO;
 import com.gic.auth.dto.MenuDTO;
+import com.gic.auth.dto.UserDTO;
 import com.gic.auth.qo.AuthItemSaveQO;
 import com.gic.auth.qo.MenuListQO;
 import com.gic.auth.qo.MenuOperationItemListQO;
@@ -415,4 +416,12 @@ public interface MenuApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

     
*/
     ServiceResponse<Void> syncProductMenu(String menuCode);
+
+    /**
+     * 过滤运维用户部门职位权限
+     * @param resultList
+     * @param tabSysUser
+     * @return
+     */
+    ServiceResponse<List<MenuDTO>> filterOperationUserDepartAuth(List<MenuDTO> resultList, UserDTO tabSysUser);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.auth.service.outer.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.gic.auth.dto.UserDTO;
 import com.gic.auth.entity.*;
 import com.gic.auth.qo.UserMenuQO;
 import com.gic.authcenter.api.dto.GicDepartmentDTO;
@@ -709,6 +710,13 @@ public class MenuApiServiceImpl implements MenuApiService {
         return ServiceResponse.success();
     }
 
+    @Override
+    public ServiceResponse<List<MenuDTO>> filterOperationUserDepartAuth(List<MenuDTO> resultList, UserDTO tabSysUser) {
+        List<TabSysMenu> list = filterOperationUserDepartAuth(EntityUtil.changeEntityListNew(TabSysMenu.class, resultList),
+                EntityUtil.changeEntityNew(TabSysUser.class, tabSysUser));
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(MenuDTO.class, list));
+    }
+
     private ServiceResponse<Void> savePage(MenuDTO menuDTO, Class clazz) {
         ServiceResponse paramsValid = ValidParamsUtils.allCheckValidate(menuDTO, clazz);
         if (!paramsValid.isSuccess()) {

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

@@ -152,6 +152,8 @@ public class CollaboratorController extends DownloadUtils{
         MenuListQO params = new MenuListQO();
         params.setProject(appId);
         params.setIsGIC(MenuProjectConstants.APP_PROJECT_CODE);
+        //普通管理员
+        params.setAuthTypeList(Arrays.asList(1));
         ServiceResponse<List<MenuDTO>> appMenuList = menuApiService.listMenuTree(params);
         if (appMenuList.isSuccess()) {
             return RestResponse.success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, appMenuList.getResult()));