Commit d9833f344f3f3c02086e5463d4a5e738361df83f
1 parent
2c3eb2c9ff
Exists in
master
and in
8 other branches
增加
Showing 1 changed file with 15 additions and 20 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
View file @
d9833f3
| ... | ... | @@ -11,6 +11,7 @@ |
| 11 | 11 | import com.lyms.platform.common.enums.YnEnums; |
| 12 | 12 | import com.lyms.platform.common.utils.ResultUtils; |
| 13 | 13 | import com.lyms.platform.common.utils.SystemConfig; |
| 14 | +import com.lyms.platform.operate.web.facade.AccessPermissionFacade; | |
| 14 | 15 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 15 | 16 | import com.lyms.platform.operate.web.result.FrontEndResult; |
| 16 | 17 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| ... | ... | @@ -46,6 +47,8 @@ |
| 46 | 47 | private AutoMatchFacade autoMatchFacade; |
| 47 | 48 | @Autowired |
| 48 | 49 | private UserOrganizationMapsService userOrganizationMapsService; |
| 50 | + @Autowired | |
| 51 | + private AccessPermissionFacade accessPermissionFacade; | |
| 49 | 52 | |
| 50 | 53 | |
| 51 | 54 | /** |
| ... | ... | @@ -211,6 +214,7 @@ |
| 211 | 214 | |
| 212 | 215 | String areaId = autoMatchFacade.match(loginState.getId()); |
| 213 | 216 | List<Map> data = new ArrayList<>(); |
| 217 | + List<Organization> organizations; | |
| 214 | 218 | if (StringUtils.isNotEmpty(areaId)) { |
| 215 | 219 | OrganizationQuery organizationQuery = new OrganizationQuery(); |
| 216 | 220 | organizationQuery.setAreaId(areaId); |
| 217 | 221 | |
| ... | ... | @@ -219,30 +223,21 @@ |
| 219 | 223 | list.add(4); |
| 220 | 224 | organizationQuery.setYn(YnEnums.YES.getId()); |
| 221 | 225 | organizationQuery.setTypeList(list); |
| 222 | - List<Organization> organizations = organizationService.queryOrganization(organizationQuery); | |
| 223 | - if (CollectionUtils.isNotEmpty(organizations)) { | |
| 224 | - for (Organization organization : organizations) { | |
| 225 | - Map<String, Object> map = new HashMap<>(); | |
| 226 | - map.put("id", organization.getId()); | |
| 227 | - map.put("name", organization.getName()); | |
| 228 | - data.add(map); | |
| 229 | - } | |
| 230 | - } | |
| 226 | + organizations = organizationService.queryOrganization(organizationQuery); | |
| 227 | + | |
| 231 | 228 | } else { |
| 232 | 229 | UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); |
| 233 | 230 | userOrganizationMapsQuery.setYn(YnEnums.YES.getId()); |
| 234 | 231 | userOrganizationMapsQuery.setUserId(loginState.getId()); |
| 235 | - List<UserOrganizationMaps> userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); | |
| 236 | - if (CollectionUtils.isNotEmpty(userOrganizationMapsList)) { | |
| 237 | - for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { | |
| 238 | - if (null != userOrganizationMaps.getOrgId()) { | |
| 239 | - Organization organization = organizationService.getOrganization(userOrganizationMaps.getOrgId()); | |
| 240 | - Map<String, Object> map = new HashMap<>(); | |
| 241 | - map.put("id", organization.getId()); | |
| 242 | - map.put("name", organization.getName()); | |
| 243 | - data.add(map); | |
| 244 | - } | |
| 245 | - } | |
| 232 | + organizations = accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId()); | |
| 233 | + | |
| 234 | + } | |
| 235 | + if (CollectionUtils.isNotEmpty(organizations)) { | |
| 236 | + for (Organization organization : organizations) { | |
| 237 | + Map<String, Object> map = new HashMap<>(); | |
| 238 | + map.put("id", organization.getId()); | |
| 239 | + map.put("name", organization.getName()); | |
| 240 | + data.add(map); | |
| 246 | 241 | } |
| 247 | 242 | } |
| 248 | 243 | return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); |