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";
         // 一个街道机构