Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

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

@@ -54,7 +54,7 @@ public interface MenuApiService {
     ServiceResponse<List<MenuDTO>> listUserMenu(Integer userId, String versionCode);
 
     /**
-     * 获取登陆用户的菜单(页面)
+     * 获取登陆用户的菜单(页面) 已构建成树结构
      * @param enterpriseId
      * @param userId
      * @param currentMenu
@@ -65,6 +65,20 @@ public interface MenuApiService {
             String versionCode);
 
     /**
+     * 获取登陆用户的菜单(页面)
+     * @Title: getUserMenuOfGicNotTree

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param userId
+     * @param currentMenu
+     * @param versionCode

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

+    
*/
+    ServiceResponse<List<MenuDTO>> getUserMenuOfGicNotTree(Integer enterpriseId, Integer userId, Integer currentMenu,
+                                                    String versionCode);
+
+    /**
      * 获取协作应用的权限页面
      * @Title: getCollaboratorAppMenuPage

      * @Description:
@@ -90,7 +104,7 @@ public interface MenuApiService {
     ServiceResponse<List<MenuDTO>> getCollaboratorAppOperationItem(List<Integer> menuIdList, String appId, boolean isSuperAdmin);
 
     /**
-     * 获取登陆用户的应用菜单（页面类型）
+     * 获取登陆用户的应用菜单（页面类型）已构建成树结构
      * @Title: getUserMenuOfApp

      * @Description: 
     
* @author guojuxing 
@@ -103,6 +117,9 @@ public interface MenuApiService {
     ServiceResponse<List<MenuDTO>> getUserMenuOfApp(Integer enterpriseId, Integer userId, Integer currentMenu,
             String versionCode);
 
+    ServiceResponse<List<MenuDTO>> getUserMenuOfAppNotTree(Integer enterpriseId, Integer userId, Integer currentMenu,
+                                                    String versionCode);
+
     /**
      * 根据用户ID查询没拥有的gic操作项（gic）
      * @Title: getNoAuthOperationItemOfGic


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

@@ -135,7 +135,13 @@ public class MenuApiServiceImpl implements MenuApiService {
 
     @Override
     public ServiceResponse<List<MenuDTO>> getUserMenuOfGic(Integer enterpriseId, Integer userId, Integer currentMenu, String versionCode) {
-        return getUserLoginMenu(enterpriseId, userId, currentMenu, true, versionCode);
+        return getUserLoginMenu(enterpriseId, userId, currentMenu, true, versionCode, true);
+    }
+
+    @Override
+    public ServiceResponse<List<MenuDTO>> getUserMenuOfGicNotTree(Integer enterpriseId, Integer userId, Integer currentMenu,
+                                                                  String versionCode) {
+        return getUserLoginMenu(enterpriseId, userId, currentMenu, true, versionCode, false);
     }
 
     @Override
@@ -151,7 +157,13 @@ public class MenuApiServiceImpl implements MenuApiService {
     @Override
     public ServiceResponse<List<MenuDTO>> getUserMenuOfApp(Integer enterpriseId, Integer userId, Integer currentMenu,
                                                            String versionCode) {
-        return getUserLoginMenu(enterpriseId, userId, currentMenu, false, versionCode);
+        return getUserLoginMenu(enterpriseId, userId, currentMenu, false, versionCode, true);
+    }
+
+    @Override
+    public ServiceResponse<List<MenuDTO>> getUserMenuOfAppNotTree(Integer enterpriseId, Integer userId, Integer currentMenu,
+                                                                  String versionCode) {
+        return getUserLoginMenu(enterpriseId, userId, currentMenu, false, versionCode, false);
     }
 
     @Override
@@ -926,10 +938,11 @@ public class MenuApiServiceImpl implements MenuApiService {
      * @param currentMenu
      * @param isGic
 是否是gic项目
      * @param versionCode 如果是gic项目，则传的是基础服务版本，如果是应用，则传递的是应用ID
+     * @param isNeedTree 是否需要构建树结构
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>

     
 */
     private ServiceResponse<List<MenuDTO>> getUserLoginMenu(Integer enterpriseId, Integer userId, Integer currentMenu, boolean isGic,
-            String versionCode) {
+            String versionCode, boolean isNeedTree) {
         //先查询登陆用户信息
         TabSysUser tabSysUser = userService.getUserById(userId);
         if (tabSysUser == null) {
@@ -995,7 +1008,11 @@ public class MenuApiServiceImpl implements MenuApiService {
             tempList.add(menu);
         }
 
-        return ServiceResponse.success(this.treeMenu(tempList, level, parentId));
+        if (isNeedTree) {
+            return ServiceResponse.success(this.treeMenu(tempList, level, parentId));
+        } else {
+            return ServiceResponse.success(EntityUtil.changeEntityListNew(MenuDTO.class, tempList));
+        }
     }
 
     private ServiceResponse<List<MenuDTO>> getAppMenuPage(Integer enterpriseId, List<Integer> menuIdList, String appId) {

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

@@ -174,9 +174,10 @@ public class MenuController {
     
 */
     @RequestMapping("/list-log-menu-tree")
     public RestResponse listMenuPageTree() {
-        MenuListQO params = new MenuListQO();
-        params.setMenuType(MenuTypeEnum.PAGE.getCode());
-        ServiceResponse<List<MenuDTO>> result = menuApiService.listMenuTree(params);
+        UserDetail userDetail = UserDetailUtils.getUserDetail();
+        //权限控制
+        ServiceResponse<List<MenuDTO>> result = menuApiService.getUserMenuOfGicNotTree(userDetail.getEnterpriseId(),
+                userDetail.getUserId(), null, userDetail.getEnterpriseInfo().getVersionCode());
         if (result.isSuccess()) {
             return RestResponse
                     .success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, result.getResult()));
@@ -186,8 +187,15 @@ public class MenuController {
 
     @RequestMapping("/list-log-app-menu-tree")
     public RestResponse listMenuAppPageTree() {
-        ServiceResponse<List<MenuDTO>> result = menuApiService
-                .listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
+        UserDetail userDetail = UserDetailUtils.getUserDetail();
+        boolean isSuperAdmin = userDetail.getUserInfo().getSuperAdmin().intValue() == 1;
+        ServiceResponse<List<MenuDTO>> result;
+        if (isSuperAdmin) {
+            result = menuApiService.listAppPageOfHasBuy(UserDetailUtils.getUserDetail().getEnterpriseId());
+        } else {
+            //权限控制
+            result = menuApiService.getUserMenuOfAppNotTree(userDetail.getEnterpriseId(), userDetail.getUserId(), null, null);
+        }
         if (result.isSuccess()) {
             return RestResponse
                     .success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, result.getResult()));
@@ -217,6 +225,8 @@ public class MenuController {
         searchParam.setInterfaceName(search);
         if (menuId != null) {
             searchParam.setRelationId(Long.valueOf(menuId));
+        } else {
+            //权限控制
         }
         SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
         if (StringUtils.isNotBlank(startTime)) {