登录数据处理调整

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

@@ -158,10 +158,10 @@ public interface MenuApiService {
      * @Title: getSuperAdminGicMenuNotTree

      * @Description:
     
 * @author guojuxing
-     * @param enterpriseId

+     * @param versionCode

      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>

     
 */
-    ServiceResponse<List<MenuDTO>> getSuperAdminMenuNotTree(Integer enterpriseId);
+    ServiceResponse<List<MenuDTO>> getAllMenuNotTree(String versionCode);
 
     /**
      * 查询gic菜单页面树数据

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

@@ -139,7 +139,7 @@ public class MenuApiServiceImpl implements MenuApiService {
             params.setMenuType(MenuTypeEnum.PAGE.getCode());
             temp.addAll(this.menuService.listMenu(params));
 
-            result = EntityUtil.changeEntityListNew(MenuDTO.class, temp);
+            result = EntityUtil.changeEntityListNew(MenuDTO.class, filterOperationUserDepartAuth(temp, tabSysUser));
         } else {
             List<TabSysMenu> menuList = getUserMenuList(userId);
             result = EntityUtil.changeEntityListNew(MenuDTO.class, menuList);
@@ -231,14 +231,21 @@ public class MenuApiServiceImpl implements MenuApiService {
     }
 
     @Override
-    public ServiceResponse<List<MenuDTO>> getSuperAdminMenuNotTree(Integer enterpriseId) {
-        //查询超级管理员
-        TabSysUser tabSysUser = userService.getUserByEnterpriseId(enterpriseId);
-        if (tabSysUser == null) {
-            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有超级管理员，数据错误");
-        }
-        String versionCode = enterpriseApiService.getEnterpriseById(enterpriseId).getResult().getVersionCode();
-        return listUserMenu(tabSysUser.getUserId(), versionCode);
+    public ServiceResponse<List<MenuDTO>> getAllMenuNotTree(String versionCode) {
+        List<TabSysMenu> temp = new ArrayList<>();
+        //超级管理员
+        MenuListQO params = new MenuListQO();
+        //查询gic的菜单
+        params.setIsGIC(MenuProjectConstants.DEFAULT_PROJECT_CODE);
+        params.setVersionCode(versionCode);
+        params.setMenuType(MenuTypeEnum.PAGE.getCode());
+        temp.addAll(this.menuService.listMenu(params));
+        //查询应用的菜单
+        params.setVersionCode("");
+        params.setIsGIC(MenuProjectConstants.APP_PROJECT_CODE);
+        params.setMenuType(MenuTypeEnum.PAGE.getCode());
+        temp.addAll(this.menuService.listMenu(params));
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(MenuDTO.class, temp));
     }
 
     @Override

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

@@ -156,7 +156,7 @@ public class LoginController {
                         //查询全部的操作模块
                         Map<String, MenuInfo> moduleMap = new HashMap<>(16);
                         ServiceResponse<List<MenuDTO>> allGicMenu = menuApiService
-                                .getSuperAdminMenuNotTree(enterpriseId);
+                                .getAllMenuNotTree(enterpriseDTO.getVersionCode());
                         if (allGicMenu.isSuccess()) {
                             List<MenuDTO> temp = allGicMenu.getResult();
                             List<MenuInfo> tempMenuInfoList = EntityUtil.changeEntityListNew(MenuInfo.class, temp);