From db0f981a76e39e0a342a56f520e56373bd1adbcc Mon Sep 17 00:00:00 2001
From: administrator <suibian6d7d8t>
Date: Mon, 11 Sep 2023 10:06:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=20#36474=20test-=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=94=A8=E4=BA=86=E4=B8=80=E4=B8=AA=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D=EF=BC=8C=E6=B2=A1=E4=BB=BB?=
 =?UTF-8?q?=E4=BD=95=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=9F=A5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=EF=BC=8C=E6=8F=90=E7=A4=BA=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/core/apiservice/controller/base/WhiteController.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
index 130e6f0..aa21d25 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
@@ -506,8 +506,12 @@ public class WhiteController extends CoreBaseController {
         SysLogUserLogin log = new SysLogUserLogin();
 
         SysUser user = userService.getSysUserByLoginName(loginName);
+        if (null == user){
+            log.setLogUserName(loginName);
+        }else {
+            log.setLogUserName(user.getUserName());
+        }
         log.setUserId(userId);
-        log.setLogUserName(user.getUserName());
         log.setLogLoginName(loginName);
         log.setLogLoginStatus(userLoginStatus);
         log.setLogLoginBrowser(ServletRequestTool.getRequestBrowser(request));