From c80135e5c3f7bfab96ba558a910a06f1e587c53c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:14:04 +0800
Subject: [PATCH] 1.新增@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") 2.将新增orgid的拦截器关掉 3.登陆新增campusid
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 de58cf7..af9e233 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
@@ -62,7 +62,7 @@
* @param uuid 鍞竴鏍囪瘑
* @return 缁撴灉
*/
- public String login(String username, String password, String code, String uuid, String orgid) {
+ public String login(String username, String password, String code, String uuid, String orgid, String campusid) {
boolean captchaEnabled = configService.selectCaptchaEnabled();
// 楠岃瘉鐮佸紑鍏�
if (captchaEnabled) {
@@ -71,7 +71,7 @@
// 鐢ㄦ埛楠岃瘉
Authentication authentication = null;
try {
- UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid, password);
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid + "&" + campusid, password);
AuthenticationContextHolder.setContext(authenticationToken);
// 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
authentication = authenticationManager.authenticate(authenticationToken);
@@ -95,7 +95,8 @@
public String loginByUserName(String userName) {
- SysUser sysUser = userService.selectUserByUserName2(userName);
+ SysUser sysUser = userService.selectUserByUserNameAndDeptId(userName);
+ log.info("---------sysUser鐨勫�间负:{}", sysUser);
if (ObjectUtils.isNotEmpty(sysUser)) {
// 鏋勫缓鐧诲綍鐢ㄦ埛瀵硅薄
LoginUser loginUser = new LoginUser();
--
Gitblit v1.9.3