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 2ec9780..09c5c6c 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
@@ -236,9 +236,18 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O
             DataPermissionsModelQuery visitQuery = new DataPermissionsModelQuery();
             visitQuery.setUserId(userId);
             List<DataPermissionsModel> list = dataPermissionService.queryPermission(visitQuery);
+            if (CollectionUtils.isEmpty(list))
+            {
+                return;
+            }
             for (DataPermissionsModel model : list) {
                 if (StringUtils.isNotBlank(model.getAreaPermission())) {
                     List<AddressBean> addressBeanList = JsonUtil.toList(model.getAreaPermission(), AddressBean.class);
+                    if (CollectionUtils.isEmpty(addressBeanList))
+                    {
+                        continue;
+                    }
+
                     Set<String> organizationIds = new HashSet<>();
                     if (model.getData() != null) {
                         for (Object s:model.getData().keySet()) {
@@ -246,6 +255,12 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O
                         }
                     }
                     for (AddressBean addressBean:addressBeanList) {
+
+                        if (addressBean == null)
+                        {
+                            continue;
+                        }
+
                         OrganizationQuery query = new OrganizationQuery();
                         query.setProvinceId(addressBean.getP());
                         query.setCityId(addressBean.getC());