From 46010f054c3ac1f0c227c829bc7791c5feeb26da Mon Sep 17 00:00:00 2001
From: hanshaofeng <hanshaofeng@lymsh.com>
Date: Thu, 24 Nov 2016 18:05:14 +0800
Subject: [PATCH] permission2

---
 .../platform/permission/service/impl/OrganizationServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
index 53a9fa2..9571812 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
@@ -228,11 +228,11 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O
             for (DataPermissionsModel model : list) {
                 if (StringUtils.isNotBlank(model.getAreaPermission())) {
                     List<AddressBean> addressBeanList = JsonUtil.toList(model.getAreaPermission(), AddressBean.class);
-                    Set<String> organizationIds = null;
+                    Set<String> organizationIds = new HashSet<>();
                     if (model.getData() != null) {
-                        organizationIds = model.getData().keySet();
-                    } else {
-                        organizationIds = new HashSet<>();
+                        for (Object s:model.getData().keySet()) {
+                            organizationIds.add(s.toString());
+                        }
                     }
                     for (AddressBean addressBean:addressBeanList) {
                         OrganizationQuery query = new OrganizationQuery();
-- 
1.8.3.1