From bf62946cc7db898afe2c5db358a3dfc1c5127fc5 Mon Sep 17 00:00:00 2001
From: yanyujia <3406185119@qq.com>
Date: Fri, 3 Feb 2023 13:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/base/WhiteController.java           | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

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 062706d..2b1b5a8 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
@@ -502,11 +502,13 @@ public class WhiteController extends CoreBaseController {
         return result;
     }
 
-    private void recordSysUserLog(Long userId, String username, Integer userLoginStatus) {
+    private void recordSysUserLog(Long userId, String loginName, Integer userLoginStatus) {
         SysLogUserLogin log = new SysLogUserLogin();
 
+        SysUser user = userService.getSysUserByLoginName(loginName);
         log.setUserId(userId);
-        log.setLogLoginName(username);
+        log.setLogUserName(user.getUserName());
+        log.setLogLoginName(loginName);
         log.setLogLoginStatus(userLoginStatus);
         log.setLogLoginBrowser(ServletRequestTool.getRequestBrowser(request));
         log.setLogLoginHost(ServletRequestTool.getRequestHost(request));
@@ -1069,6 +1071,25 @@ public class WhiteController extends CoreBaseController {
         return ResultBean.success("查询成功!").setResultObject(user);
     }
 
+    /**
+     * 根据登录名获取用户账号信息
+     *
+     * @param loginName
+     * @return
+     */
+    @GetMapping(value = "/user/query-user-by-loginName")
+    @ApiOperation(value = "根据条件查询单个用户信息", notes = "根据条件查询单个用户信息")
+    public ResultBean querySysUserByLoginName(String loginName) {
+        ValidatorBean.checkNotNull(loginName, "用户登录名不能为空!");
+        SysUser sysUser = null;
+        try {
+            sysUser = userService.getSysUserByLoginName(loginName);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e.getMessage());
+        }
+        return ResultBean.success("查询成功!").setResultObject(sysUser);
+    }
+
     @PostMapping(value = "/sendEmail")
     @ApiOperation(value = "无需登录,发送邮件")
     public ResultBean sendEmail(@RequestBody ImppEmail imppEmail) {