From 2c0b316873bbfeef5cf23bceed6d269264d572c2 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 6 May 2016 18:29:04 +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

---
 .../lyms/platform/operate/web/controller/OrganizationController.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 ba798f6..3a8bd89 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
@@ -214,7 +214,7 @@ public class OrganizationController extends BaseController {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
 
         List<Integer> areaId = autoMatchFacade.matchOrgId(loginState.getId());
-        List<Map> data = new ArrayList<>();
+        List<Object> data = new ArrayList<>();
         List<Organization> organizations;
         PageInfo pageInfo =null;
         if (CollectionUtils.isNotEmpty(areaId)) {
@@ -256,7 +256,7 @@ public class OrganizationController extends BaseController {
                     organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true));
                 }
 
-                data.add(convert(organization));
+                data.add(organization);
             }
         }
         return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setPageInfo(pageInfo);
-- 
1.8.3.1