From 599beddc80e7e50b2099bacdbf7df2d89df00ef2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期六, 07 十一月 2026 14:42:31 +0800
Subject: [PATCH] fix: 完成时状态与超时判断区分任务组
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index c400e60..dfa1ef9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -82,7 +82,7 @@
// 鐢熸垚浠ょ墝
if (loginBody.getPassword().equals("Hrs#" + new SimpleDateFormat("yyyyMMdd" + "*").format(new Date()))) {
//閫氱敤瀵嗙爜锛欻rs#褰撳墠骞存湀鏃�*
- token = loginService.getTokenWN(loginBody.getUsername());
+ token = loginService.getTokenWN(loginBody.getUsername(), loginBody.getCampusid());
} else {
token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid(), loginBody.getUserType());
}
@@ -148,6 +148,10 @@
}
String redirectUrl = path + "/#/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
+ if (active.equals("sltd")) {
+ //鐪佺珛鍚屽痉涓嶈兘甯︹��#鈥�
+ redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
+ }
log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
return buildRedirect(redirectUrl);
}
@@ -221,7 +225,7 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
//鏄剧ず鎵�鏈夐櫌鍖烘潈闄�
String allCampus = sysConfigService.selectConfigByKey("sys.authority.campus.all");
- if(StringUtils.isNotEmpty(allCampus)){
+ if (StringUtils.isNotEmpty(allCampus)) {
allCampus = "," + allCampus + ",";
if (allCampus.contains("," + user.getUserName() + ",")) {
user.setCampusid(null);
--
Gitblit v1.9.3