Commit 2c0b316873bbfeef5cf23bceed6d269264d572c2
1 parent
aecabd036f
Exists in
master
and in
1 other branch
增加
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
View file @
2c0b316
| ... | ... | @@ -214,7 +214,7 @@ |
| 214 | 214 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 215 | 215 | |
| 216 | 216 | List<Integer> areaId = autoMatchFacade.matchOrgId(loginState.getId()); |
| 217 | - List<Map> data = new ArrayList<>(); | |
| 217 | + List<Object> data = new ArrayList<>(); | |
| 218 | 218 | List<Organization> organizations; |
| 219 | 219 | PageInfo pageInfo =null; |
| 220 | 220 | if (CollectionUtils.isNotEmpty(areaId)) { |
| ... | ... | @@ -256,7 +256,7 @@ |
| 256 | 256 | organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true)); |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - data.add(convert(organization)); | |
| 259 | + data.add(organization); | |
| 260 | 260 | } |
| 261 | 261 | } |
| 262 | 262 | return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setPageInfo(pageInfo); |