增加查询项目区分平台管理员

src/main/java/com/fdkankan/site/service/impl/ProjectServiceImpl.java

@@ -178,19 +178,8 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         VUtils.isTure(projectId == null).throwMessage(ResultCode.PARAM_MISS);
         Project project = this.getById(projectId);
         VUtils.isTure(project == null).throwMessage(ResultCode.PROJECT_NOT_EXIST);
-        boolean adminFlag=false;
 
-        FdkkResponse<FdkkManagerUserVo> manageUserInfo = fdKKClient.getManageUserInfo(token);
-        log.info("返回角色{}",manageUserInfo);
-        if(manageUserInfo.getCode() == 0){
-            if (ArrayUtil.isNotEmpty(manageUserInfo.getData().getRoleIds())){
-                if (manageUserInfo.getData().getRoleIds().contains(5L)){
-                    adminFlag = true;
-                }
-            }
-        }
-        log.info("返回角色判断{}",adminFlag);
-        if(StringUtils.isNotBlank(token) && StringUtils.isBlank(sceneOrder)&&!adminFlag){
+        if(StringUtils.isNotBlank(token) && StringUtils.isBlank(sceneOrder)){
             checkTokenPer(token, projectId);
         }
         ProjectInfoVo infoVo = new ProjectInfoVo();
@@ -429,10 +418,24 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
 
     @Override
     public void checkTokenPer(String token,Integer projectId){
-        User user = userService.findByTokenCovUserName(token);
-        List<ProjectTeam> teamList = projectTeamService.getListByUserIdAndProjectId(user.getUserId(),projectId);
-        if(CollectionUtil.isEmpty(teamList)){
-            throw new BusinessException(ResultCode.NOT_PERM);
+        boolean adminFlag=false;
+
+        FdkkResponse<FdkkManagerUserVo> manageUserInfo = fdKKClient.getManageUserInfo(token);
+        log.info("checkTokenPer返回角色{}",manageUserInfo);
+        if(manageUserInfo.getCode() == 0){
+            if (ArrayUtil.isNotEmpty(manageUserInfo.getData().getRoleIds())){
+                if (manageUserInfo.getData().getRoleIds().contains(5L)){
+                    adminFlag = true;
+                }
+            }
+        }
+        log.info("checkTokenPer返回角色判断{}",adminFlag);
+        if (!adminFlag){
+            User user = userService.findByTokenCovUserName(token);
+            List<ProjectTeam> teamList = projectTeamService.getListByUserIdAndProjectId(user.getUserId(),projectId);
+            if(CollectionUtil.isEmpty(teamList)){
+                throw new BusinessException(ResultCode.NOT_PERM);
+            }
         }
     }