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