ソースを参照

copyScene -mq

lyhzzz 1 年間 前
コミット
5c91658bb6

+ 8 - 2
src/main/java/com/fdkankan/manage_jp/service/impl/ProjectSceneGpsServiceImpl.java

@@ -145,10 +145,16 @@ public class ProjectSceneGpsServiceImpl extends ServiceImpl<IProjectSceneGpsMapp
         HashMap<Integer,Project> projectMap = new HashMap<>();
         if(param.getType() == 0){       //项目场景
             List<Project> projectList = new ArrayList<>();
-            if(!roleIds.contains(5L)) {      //平台管理员
+            if(!roleIds.contains(5L) && param.getProjectId() == null) {      //平台管理员
                 projectList =  projectService.listByCompanyId(param.getCompanyId());
-            }else {
+            }else if(param.getProjectId() == null){
                 projectList = projectService.listShow();
+            }else {
+                Project project = projectService.getById(param.getProjectId());
+                projectList = Arrays.asList(project);
+            }
+            if(projectList == null || projectList.isEmpty()){
+                return new ArrayList<>();
             }
             for (Project project : projectList) {
                 projectMap.put(project.getId(),project);