From 5afd363c9420b890fdcf42a4f02c65a58ad66123 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 28 Oct 2022 16:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E7=BB=86=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=BA=E6=9E=84=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xboe/system/user/api/UserApi.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java
index c81d6ce6..60db877b 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java
@@ -147,7 +147,10 @@ public class UserApi extends ApiBaseController {
             user.setDynamic(u.getDynamic());
             if (StringUtils.isNotBlank(user.getDepartId())) {
                 Organization org = organizationService.get(user.getDepartId());
-                user.setDepartName(org.getName());
+                if(org!=null) {
+                	user.setDepartName(org.getName());
+                }
+                
             }
         }
         return success(user);