|
@@ -305,20 +305,20 @@ public class MgrUserService {
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- // 关联公司
|
|
|
- List<MgrOrganizationProject> bindOrganizationList = mgrOrganizationProjectDao.getBindOrganizationId(user.getLastOrganizationId());
|
|
|
- if (bindOrganizationList != null && bindOrganizationList.size() > 0) {
|
|
|
- for (MgrOrganizationProject bind : bindOrganizationList) {
|
|
|
- if(map.containsKey(bind.getProjectId())){
|
|
|
- Set<JSONObject> jsonObjects = map.get(bind.getProjectId());
|
|
|
- jsonObjects.add(convert(bind.getIdentityId()));
|
|
|
- }else {
|
|
|
- Set<JSONObject> identityList = new HashSet<>();
|
|
|
- identityList.add(convert(bind.getIdentityId()));
|
|
|
- map.put(bind.getProjectId(), identityList);
|
|
|
- }
|
|
|
- }
|
|
|
+ // 关联公司
|
|
|
+ List<MgrOrganizationProject> bindOrganizationList = mgrOrganizationProjectDao.getBindOrganizationId(user.getLastOrganizationId());
|
|
|
+ if (bindOrganizationList != null && bindOrganizationList.size() > 0) {
|
|
|
+ for (MgrOrganizationProject bind : bindOrganizationList) {
|
|
|
+ if (map.containsKey(bind.getProjectId())) {
|
|
|
+ Set<JSONObject> jsonObjects = map.get(bind.getProjectId());
|
|
|
+ jsonObjects.add(convert(bind.getIdentityId()));
|
|
|
+ } else {
|
|
|
+ Set<JSONObject> identityList = new HashSet<>();
|
|
|
+ identityList.add(convert(bind.getIdentityId()));
|
|
|
+ map.put(bind.getProjectId(), identityList);
|
|
|
}
|
|
|
}
|
|
|
}
|