Commit 27116ad4ff8dfd1d224907c6897463f3e6cc5fc1
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
View file @
27116ad
| ... | ... | @@ -237,6 +237,14 @@ |
| 237 | 237 | Map<String, Object> map = new HashMap<>(); |
| 238 | 238 | map.put("id", organization.getId()); |
| 239 | 239 | map.put("name", organization.getName()); |
| 240 | + map.put("areaId", organization.getAreaId()); | |
| 241 | + map.put("area", organization.getArea()); | |
| 242 | + map.put("city", organization.getCity()); | |
| 243 | + map.put("cityId", organization.getCityId()); | |
| 244 | + map.put("province", organization.getProvince()); | |
| 245 | + map.put("provinceId", organization.getProvinceId()); | |
| 246 | + map.put("foreignId", organization.getForeignId()); | |
| 247 | + map.put("code", organization.getShortCode()); | |
| 240 | 248 | data.add(map); |
| 241 | 249 | } |
| 242 | 250 | } |
| 243 | 251 | |
| 244 | 252 | |
| ... | ... | @@ -293,14 +301,14 @@ |
| 293 | 301 | } |
| 294 | 302 | } |
| 295 | 303 | } |
| 296 | - } else if ("0".equals(areaId) ||null==areaId) { | |
| 304 | + } else if ("0".equals(areaId) || null == areaId) { | |
| 297 | 305 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 298 | 306 | List<Integer> list = autoMatchFacade.matchOrgId(loginState.getId()); |
| 299 | - List<String> a = new ArrayList<>(); | |
| 307 | + List<String> a = new ArrayList<>(); | |
| 300 | 308 | for (Integer integer : list) { |
| 301 | 309 | Organization organization = organizationService.getOrganization(integer); |
| 302 | 310 | if (null != organization) { |
| 303 | - a.add(organization.getProvinceId()); | |
| 311 | + a.add(organization.getProvinceId()); | |
| 304 | 312 | } |
| 305 | 313 | } |
| 306 | 314 | organizationQuery.setProvinceIds(a); |