From 26e9d2d7953bcb8eecaa9f7ce0527abf64f73d0f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 10:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/system/service/UserDetailsServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/system/service/UserDetailsServiceImpl.java b/ycl-server/src/main/java/com/ycl/system/service/UserDetailsServiceImpl.java
index 5988e14..f16c005 100644
--- a/ycl-server/src/main/java/com/ycl/system/service/UserDetailsServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/system/service/UserDetailsServiceImpl.java
@@ -1,11 +1,13 @@
package com.ycl.system.service;
import com.ycl.exception.ServiceException;
+import com.ycl.platform.service.YwUnitService;
import com.ycl.system.entity.SysUser;
import com.ycl.system.model.LoginUser;
import com.ycl.utils.MessageUtils;
import com.ycl.utils.StringUtils;
import enumeration.UserStatus;
+import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,18 +22,15 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class UserDetailsServiceImpl implements UserDetailsService
{
private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private SysPasswordService passwordService;
-
- @Autowired
- private SysPermissionService permissionService;
+ private final ISysUserService userService;
+ private final SysPasswordService passwordService;
+ private final SysPermissionService permissionService;
+ private final YwUnitService unitService;
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
@@ -60,6 +59,8 @@
public UserDetails createLoginUser(SysUser user)
{
- return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+ LoginUser loginUser = new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+ unitService.setUnitInfo(loginUser);
+ return loginUser;
}
}
--
Gitblit v1.8.0