|
@@ -142,7 +142,10 @@ public class ProjectService {
|
|
|
if (userContext.isAdmin()) {
|
|
|
list = projectDao.getProjectByOrganizationId(userContext.getOrganizationId());
|
|
|
if (list != null && list.size() > 0) {
|
|
|
+ Set<JSONObject> set = new HashSet<>();
|
|
|
+ set.add(JSONObject.parseObject(UserContext.IDENTITY_OWNER_DATA));
|
|
|
for (Project project : list) {
|
|
|
+ project.setProjectListIdentity(set);
|
|
|
map.put(project.getId(), project);
|
|
|
}
|
|
|
}
|
|
@@ -156,19 +159,19 @@ public class ProjectService {
|
|
|
// 所有者
|
|
|
if (list.size() > 0) {
|
|
|
List<Project> ls = getIds(ids);
|
|
|
+ Map<Long, Project> mapID = new HashMap();
|
|
|
for (Project project : ls) {
|
|
|
Set<JSONObject> jsonObjects = projectListIdentity.get(project.getId());
|
|
|
if(map.containsKey(project.getId())){
|
|
|
jsonObjects.add(JSONObject.parseObject(UserContext.IDENTITY_OWNER_DATA));
|
|
|
}
|
|
|
project.setProjectListIdentity(jsonObjects);
|
|
|
+ mapID.put(project.getId(), project);
|
|
|
}
|
|
|
- for (Project project : ls) {
|
|
|
- Set<JSONObject> jsonObjects = projectListIdentity.get(project.getId());
|
|
|
- if(map.containsKey(project.getId())){
|
|
|
- jsonObjects.add(JSONObject.parseObject(UserContext.IDENTITY_OWNER_DATA));
|
|
|
+ for (Project project : list) {
|
|
|
+ if (!mapID.containsKey(project.getId())) {
|
|
|
+ ls.add(project);
|
|
|
}
|
|
|
- project.setProjectListIdentity(jsonObjects);
|
|
|
}
|
|
|
return ls;
|
|
|
}
|