From 23f8e1fdb85aa9cef22ecff5b30e28cd3a06d09a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 十一月 2024 18:51:19 +0800
Subject: [PATCH] 生成数据明细导出修改

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 5dcdf90..eba9882 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
@@ -37,7 +37,12 @@
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
-        SysUser user = userService.selectUserByUserName(username);
+        SysUser user;
+        if(username.contains("_")){
+            user = userService.selectUserByUserName(username.split("_")[0]);
+        }else {
+            user = userService.selectUserByUserName(username);
+        }
         if (StringUtils.isNull(user))
         {
             log.info("登录用户:{} 不存在.", username);
@@ -53,8 +58,11 @@
             log.info("登录用户:{} 已被停用.", username);
             throw new ServiceException(MessageUtils.message("user.blocked"));
         }
-
-        passwordService.validate(user);
+        if(username.contains("_")){
+            passwordService.reValidate(user);
+        }else {
+            passwordService.validate(user);
+        }
 
         return createLoginUser(user);
     }

--
Gitblit v1.7.1