From f8e3f252a6d59206d3b9dcccce6d0c374890445e Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 6 May 2016 17:24: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

---
 .../lyms/platform/operate/web/controller/OrganizationController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 cc9f157..1c6102d 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
@@ -293,7 +293,7 @@ public class OrganizationController extends BaseController {
                     }
                 }
             }
-        } else if ("0".equals(areaId)) {
+        } else if ("0".equals(areaId) ||null==areaId) {
             LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
             List<Integer> list = autoMatchFacade.matchOrgId(loginState.getId());
             List<String> a =  new ArrayList<>();
-- 
1.8.3.1