From aecabd036f716b4a9994c05d041a52e8470118fb Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 6 May 2016 18:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/OrganizationController.java | 28 ++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 800f3e2..ba798f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -241,18 +241,22 @@ public class OrganizationController extends BaseController { } if (CollectionUtils.isNotEmpty(organizations)) { for (Organization organization : organizations) { - Map map = new HashMap<>(); - map.put("id", organization.getId()); - map.put("name", organization.getName()); - map.put("areaId", organization.getAreaId()); - map.put("area", organization.getArea()); - map.put("city", organization.getCity()); - map.put("cityId", organization.getCityId()); - map.put("province", organization.getProvince()); - map.put("provinceId", organization.getProvinceId()); - map.put("foreignId", organization.getForeignId()); - map.put("code", organization.getShortCode()); - data.add(map); + organization.setTypeObj(OrganizationLevelEnum.getById(organization.getLevel())); + organization.setLevelObj(OrganizationTypeEnum.getById(organization.getType())); + if (null != organization.getProvinceId()) { + organization.setProvince(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getProvinceId()), true)); + } + if (null != organization.getCityId()) { + organization.setCity(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getCityId()), true)); + } + if (null != organization.getAreaId()) { + organization.setArea(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getAreaId()), true)); + } + if (null != organization.getStreetId()) { + organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true)); + } + + data.add(convert(organization)); } } return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setPageInfo(pageInfo); -- 1.8.3.1