From 2ec1c3ad2334236c754c8fe1007acd6c8f2fc9f1 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 29 Apr 2020 17:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E4=BF=A1=E6=81=AF=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index cdf9227d7..7543ca196 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -461,10 +461,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public DeptOption getStreetByLoginUser() {
         DeptOption result = getUserDeptOption(SecurityUser.getUserId());
-        List<JSONObject> options = result.getOptions();
-        if (options.isEmpty()) {
+        if (null == result || result.getOptions().isEmpty()) {
             return result;
         }
+        List<JSONObject> options = result.getOptions();
         // 代表存在子级机构的json key
         String childJsonOptionKey = "children";
         // 一个街道机构