Commit aecabd036f716b4a9994c05d041a52e8470118fb
1 parent
7da604b55f
Exists in
master
and in
8 other branches
增加
Showing 1 changed file with 16 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
View file @
aecabd0
| ... | ... | @@ -241,18 +241,22 @@ |
| 241 | 241 | } |
| 242 | 242 | if (CollectionUtils.isNotEmpty(organizations)) { |
| 243 | 243 | for (Organization organization : organizations) { |
| 244 | - Map<String, Object> map = new HashMap<>(); | |
| 245 | - map.put("id", organization.getId()); | |
| 246 | - map.put("name", organization.getName()); | |
| 247 | - map.put("areaId", organization.getAreaId()); | |
| 248 | - map.put("area", organization.getArea()); | |
| 249 | - map.put("city", organization.getCity()); | |
| 250 | - map.put("cityId", organization.getCityId()); | |
| 251 | - map.put("province", organization.getProvince()); | |
| 252 | - map.put("provinceId", organization.getProvinceId()); | |
| 253 | - map.put("foreignId", organization.getForeignId()); | |
| 254 | - map.put("code", organization.getShortCode()); | |
| 255 | - data.add(map); | |
| 244 | + organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); | |
| 245 | + organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); | |
| 246 | + if (null != organization.getProvinceId()) { | |
| 247 | + organization.setProvince(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getProvinceId()), true)); | |
| 248 | + } | |
| 249 | + if (null != organization.getCityId()) { | |
| 250 | + organization.setCity(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getCityId()), true)); | |
| 251 | + } | |
| 252 | + if (null != organization.getAreaId()) { | |
| 253 | + organization.setArea(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getAreaId()), true)); | |
| 254 | + } | |
| 255 | + if (null != organization.getStreetId()) { | |
| 256 | + organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true)); | |
| 257 | + } | |
| 258 | + | |
| 259 | + data.add(convert(organization)); | |
| 256 | 260 | } |
| 257 | 261 | } |
| 258 | 262 | return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setPageInfo(pageInfo); |