From 4e2306373ec292eb96cc4221ecc9175f0b25c6a0 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 6 May 2016 18:02:25 +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 --- .../operate/web/controller/OrganizationController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 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 1c6102d..d262a97 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 @@ -237,6 +237,14 @@ public class OrganizationController extends BaseController { 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); } } @@ -293,14 +301,14 @@ public class OrganizationController extends BaseController { } } } - } else if ("0".equals(areaId) ||null==areaId) { + } else if ("0".equals(areaId) || null == areaId) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); List list = autoMatchFacade.matchOrgId(loginState.getId()); - List a = new ArrayList<>(); + List a = new ArrayList<>(); for (Integer integer : list) { Organization organization = organizationService.getOrganization(integer); if (null != organization) { - a.add(organization.getProvinceId()); + a.add(organization.getProvinceId()); } } organizationQuery.setProvinceIds(a); -- 1.8.3.1