修改获取组织机构信息空指针问题

6 years ago · 2ec1c3ad23
1 changed files with 2 additions and 2 deletions
--- 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";
        // 一个街道机构