|
@@ -276,15 +276,16 @@ public class MgrUserService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
List<MgrOrganizationProject> list = mgrOrganizationProjectDao.get(mgrUserRole.getOrganizationId(), userId);
|
|
|
if (list != null & list.size() > 0) {
|
|
|
for (MgrOrganizationProject mop : list) {
|
|
|
projectIds.add(mop.getProjectId());
|
|
|
}
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- if (projectIds.size() > 0) {
|
|
|
+ if (projectIds.size() > 0) {
|
|
|
+ for (MgrUserRole mgrUserRole : userRoles) {
|
|
|
for (Long projectId : projectIds) {
|
|
|
Set<JSONObject> identityList = new HashSet<>();
|
|
|
if (isAdmin(user, mgrUserRole.getOrganizationId())) {
|
|
@@ -295,7 +296,10 @@ public class MgrUserService {
|
|
|
map.put(projectId, identityList);
|
|
|
}
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
+ for (MgrUserRole mgrUserRole : userRoles) {
|
|
|
+ List<MgrOrganizationProject> list = mgrOrganizationProjectDao.get(mgrUserRole.getOrganizationId(), userId);
|
|
|
if (list != null & list.size() > 0) {
|
|
|
for (MgrOrganizationProject mop : list) {
|
|
|
map.forEach((key, value) -> {
|