From 459aa78c84cf552ebea6ef056d978c2531d71ac8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 06 三月 2026 17:14:27 +0800
Subject: [PATCH] 代码提交
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
index e9704bf..f95d141 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
@@ -20,8 +20,7 @@
* @author ruoyi
*/
@Service
-public class UserDetailsServiceImpl implements UserDetailsService
-{
+public class UserDetailsServiceImpl implements UserDetailsService {
private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
@Autowired
@@ -34,36 +33,30 @@
private SysPermissionService permissionService;
@Override
- public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
- {
+ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
String[] split = username.split("&");
SysUser user = userService.selectUserByUserName2(username);
- if (StringUtils.isNull(user))
- {
+ if (StringUtils.isNull(user)) {
log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
throw new ServiceException("鐧诲綍鐢ㄦ埛锛�" + split[0] + " 涓嶅瓨鍦�,鎴栨満鏋勪笉姝ｇ‘锛岃妫�鏌ュ悗閲嶆柊鐧婚檰");
- }
- else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
- {
+ } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍒犻櫎.", username);
throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + split[0] + " 宸茶鍒犻櫎");
- }
- else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
- {
+ } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + split[0] + " 宸插仠鐢�");
- }else if(!user.getOrgid().equals(split[1])){
- log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶆槸鏈櫌甯愬彿锛歿}", username,split[1]);
- throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + split[0] + " 涓嶆槸鏈櫌鐨�");
+ } else if (StringUtils.isEmpty(user.getOrgid()) || StringUtils.isEmpty(split[1]) || !user.getOrgid().trim().equals(split[1].trim())) {
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶆槸鏈尰闄㈠笎鍙凤細{}", username, split[1]);
+ throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + split[0] + " 涓嶆槸鏈尰闄㈢殑");
}
+//-0/-85#4-
passwordService.validate(user);
return createLoginUser(user);
}
- public UserDetails createLoginUser(SysUser user)
- {
+ public UserDetails createLoginUser(SysUser user) {
return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
}
}
--
Gitblit v1.9.3