From 69b10ab2a3e171e6f30091ee54d8957cf4987809 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 10:54:43 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 598492b..76db9e8 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -24,6 +24,7 @@
import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -138,6 +139,7 @@
// 用户验证
Authentication authentication = null;
// 用户验证
+ username = username + "_applet";
SysUser user = userService.selectUserByUserName(username);
if (StringUtils.isNull(user)){
log.info("登录用户：{} 不存在.", username);
@@ -176,6 +178,7 @@
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUserApplet loginUser = (LoginUserApplet) authentication.getPrincipal();
recordLoginInfo(loginUser.getUserId());
+ loginUser.setDeptType(user.getDeptType());
// 生成token
return loginUser;
}
@@ -217,7 +220,7 @@
throw new ServiceException("短信验证码错误");
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
- LoginUser loginUser = new LoginUser(user.getUserId(), Long.valueOf(user.getDeptId()), user, permissionService.getMenuPermission(user));
+ LoginUser loginUser = new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
recordLoginInfo(loginUser.getUserId());
// 生成token
return loginUser;
@@ -260,9 +263,7 @@
throw new ServiceException("短信验证码错误");
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
- TTenantResp tTenantResp = new TTenantResp();
- BeanUtils.copyProperties(user,tTenantResp);
- LoginUserApplet loginUser = new LoginUserApplet(user.getUserId(), null, tTenantResp, null);
+ LoginUserApplet loginUser = new LoginUserApplet(user.getUserId(), null, user, null);
// 生成token
return loginUser;
}
--
Gitblit v1.7.1