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

src/main/java/com/fdkankan/site/httpClient/client/FdKKClient.java

@@ -5,6 +5,7 @@ import com.dtflys.forest.annotation.*;
 import com.fdkankan.site.httpClient.address.FdkkAddressSource;
 import com.fdkankan.site.httpClient.request.FdkkLoginRequest;
 import com.fdkankan.site.httpClient.response.FdkkLoginVo;
+import com.fdkankan.site.httpClient.response.FdkkManagerUserVo;
 import com.fdkankan.site.httpClient.response.FdkkResponse;
 import com.fdkankan.site.httpClient.response.FdkkUserVo;
 import com.fdkankan.site.request.SceneParam;
@@ -41,7 +42,11 @@ public interface FdKKClient {
      */
     @Post("/api/user/getUserInfo")
     FdkkResponse<FdkkUserVo> getUserInfo(@JSONBody JSONObject jsonObject, @Header("token") String token);
-
+    /**
+     * 获取用户详情
+     */
+    @Post("/service/manage_jp/user/getUserInfo")
+    FdkkResponse<FdkkManagerUserVo> getManageUserInfo(@Header("token") String token);
     /**
      * 获取v4场景数据
      */

src/main/java/com/fdkankan/site/httpClient/response/FdkkManagerUserVo.java

@@ -0,0 +1,11 @@
+package com.fdkankan.site.httpClient.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FdkkManagerUserVo {
+    private Integer id ;
+    List<Long> roleIds;
+}

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

@@ -1,6 +1,7 @@
 package com.fdkankan.site.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -16,6 +17,10 @@ import com.fdkankan.site.entity.dto.MarkingDTO;
 import com.fdkankan.site.entity.dto.ProjectTeamDTO;
 import com.fdkankan.site.exception.BusinessException;
 import com.fdkankan.site.httpClient.bim.BusinessStatus;
+import com.fdkankan.site.httpClient.client.FdKKClient;
+import com.fdkankan.site.httpClient.response.FdkkManagerUserVo;
+import com.fdkankan.site.httpClient.response.FdkkResponse;
+import com.fdkankan.site.httpClient.response.FdkkUserVo;
 import com.fdkankan.site.mapper.IProjectMapper;
 import com.fdkankan.site.request.ProjectAddSceneParam;
 import com.fdkankan.site.request.ProjectDelSceneParam;
@@ -34,6 +39,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -66,6 +72,9 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
     IRoleService roleService;
     @Autowired
     IMarkingService markingService;
+    @Resource
+    FdKKClient fdKKClient;
+
     @Override
     public Object getUserData(String token) {
         UserData userData = new UserData();
@@ -117,9 +126,22 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
                 .leftJoin(User.class, User::getUserId, ProjectTeam::getUserId)
                 .eq(ProjectTeam::getIsCreater,1)
                 .orderByDesc(Project::getCreateTime);
-        ;
 
-        wrapper.in(Project::getProjectId,projectIdSet);
+        boolean adminFlag=false;
+
+        FdkkResponse<FdkkManagerUserVo> manageUserInfo = fdKKClient.getManageUserInfo(token);
+        if(manageUserInfo.getCode() != 0){
+            if (ArrayUtil.isNotEmpty(manageUserInfo.getData().getRoleIds())){
+                    if (manageUserInfo.getData().getRoleIds().contains(5)){
+                        adminFlag = true;
+                    }
+            }
+        }
+
+        if(!adminFlag){
+            wrapper.in(Project::getProjectId,projectIdSet);
+        }
+
         if(StringUtils.isNotBlank(param.getProjectName())){
             wrapper.like(Project::getProjectName,param.getProjectName());
         }