From a3f37b7d32559b74dcb4335ead3c6b992a7739d0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 四月 2026 14:52:48 +0800
Subject: [PATCH] 提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 fc8b79d..ca1b30b 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
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import com.ruoyi.common.annotation.IpWhitelist;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -14,10 +15,11 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
-import com.smartor.mapper.SysUserDeptMapper;
+import com.ruoyi.system.mapper.SysUserDeptMapper;
import com.smartor.service.IServiceSLTDHealthcareRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.view.RedirectView;
@@ -54,6 +56,7 @@
private IServiceSLTDHealthcareRecordService iServiceSLTDHealthcareRecordService;
@Autowired
+ @Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
/**
@@ -97,12 +100,12 @@
*/
// @IpWhitelist
@GetMapping("/SSOLogin")
- public RedirectView SSOLogin(@RequestParam(required = false) String userName,
- @RequestParam(required = false) String orgid,
- @RequestParam(required = false) String campusid,
+ public RedirectView SSOLogin(@RequestParam(required = false) String campusid,
@RequestParam(required = false) String deptId,
+ String orgid,
+ String userName,
String token) {
- if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) {
+ if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token) && StringUtils.isEmpty(orgid)) {
throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
}
--
Gitblit v1.9.3