From cd1a68f15e107f036d9c265db88bc775a36f43c7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 10:26:18 +0800
Subject: [PATCH] update 防止 MP 无主键警告

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
index cf5afc5..8ec0fe2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
@@ -1,9 +1,12 @@
 package com.ruoyi.system.service.impl;
 
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysUserOnline;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISysUserOnlineService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -11,8 +14,11 @@
  *
  * @author Lion Li
  */
+@RequiredArgsConstructor
 @Service
 public class SysUserOnlineServiceImpl implements ISysUserOnlineService {
+
+    private final SysUserMapper userMapper;
 
     /**
      * 閫氳繃鐧诲綍鍦板潃鏌ヨ淇℃伅
@@ -68,9 +74,10 @@
      */
     @Override
     public SysUserOnline loginUserToUserOnline(LoginUser user) {
-        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser())) {
+        if (StringUtils.isNull(user)) {
             return null;
         }
+        SysUser sysUser = userMapper.selectUserById(user.getUserId());
         SysUserOnline sysUserOnline = new SysUserOnline();
         sysUserOnline.setTokenId(user.getToken());
         sysUserOnline.setUserName(user.getUsername());
@@ -79,8 +86,8 @@
         sysUserOnline.setBrowser(user.getBrowser());
         sysUserOnline.setOs(user.getOs());
         sysUserOnline.setLoginTime(user.getLoginTime());
-        if (StringUtils.isNotNull(user.getUser().getDept())) {
-            sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
+        if (StringUtils.isNotNull(sysUser.getDept())) {
+            sysUserOnline.setDeptName(sysUser.getDept().getDeptName());
         }
         return sysUserOnline;
     }

--
Gitblit v1.9.3