From 87b79ea739ec32bd7d0e493a6ea8525212f6c763 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 10 十月 2026 15:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261008
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 10 +---------
1 files changed, 1 insertions(+), 9 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 d47e10f..c400e60 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
@@ -137,14 +137,6 @@
if (StringUtils.isEmpty(systype)) path = sysConfigService.selectConfigByKey("sys.qddz");
else path = sysConfigService.selectConfigByKey("sys.qddz.yd");
- if (active.equals("nhfy")){
- //鍗楀崕闄勪竴鐨勶紝鍏堜笉璧板厤鐧伙紝鐩存帴璺冲埌鐧婚檰椤�
- path = sysConfigService.selectConfigByKey("sys.qddz.yd");
- log.info("銆怤HFYSSO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", path);
- return buildRedirect(path);
- }
- log.info("qddz鐨勬煡璇㈠�间负锛宲ath锛歿}", path);
-
if (StringUtils.isEmpty(path)) {
throw new BaseException("璇烽厤缃墠绔湴鍧�");
}
@@ -155,7 +147,7 @@
return buildRedirect(path + "/login");
}
- String redirectUrl = path + "/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
+ String redirectUrl = path + "/#/loginSSO?token=" + loginToken + "&orgid=" + orgid + "&campusid=" + campusid + "&orgname=null&ZuHuID=null&deptCode=null";
log.info("銆怱SO鐧诲綍銆戦噸瀹氬悜鍦板潃锛歿}", redirectUrl);
return buildRedirect(redirectUrl);
}
--
Gitblit v1.9.3