|
@@ -196,7 +196,7 @@ public class ProjectSceneGpsServiceImpl extends ServiceImpl<IProjectSceneGpsMapp
|
|
List<UserRole> roleIdList = userRoleService.getByUserId((param.getUserId()));
|
|
List<UserRole> roleIdList = userRoleService.getByUserId((param.getUserId()));
|
|
List<Long> roleIds = roleIdList.stream().map(UserRole::getRoleId).collect(Collectors.toList());
|
|
List<Long> roleIds = roleIdList.stream().map(UserRole::getRoleId).collect(Collectors.toList());
|
|
HashMap<Integer,List<String>> projectNumMap = new HashMap<>();
|
|
HashMap<Integer,List<String>> projectNumMap = new HashMap<>();
|
|
- TreeMap<Integer,Project> projectMap = new TreeMap<>();
|
|
|
|
|
|
+ LinkedHashMap<Integer,Project> projectMap = new LinkedHashMap<>();
|
|
if(param.getType() == 0){ //项目场景
|
|
if(param.getType() == 0){ //项目场景
|
|
List<Project> projectList = new ArrayList<>();
|
|
List<Project> projectList = new ArrayList<>();
|
|
if(!roleIds.contains(5L) && param.getProjectId() == null) { //平台管理员
|
|
if(!roleIds.contains(5L) && param.getProjectId() == null) { //平台管理员
|