From a5482140ab58009b2453fe982da1fd9764a7a4ab Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 08 一月 2026 15:32:41 +0800
Subject: [PATCH] 【市一】提供问题统计接口(通过scriptid)

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 397e99c..d51991f 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
@@ -85,7 +85,7 @@
     public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();
         // 鐢熸垚浠ょ墝
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid());
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOrgid(), loginBody.getCampusid());
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }
@@ -116,7 +116,7 @@
      */
 //    @IpWhitelist
     @GetMapping("/SSOLogin")
-    public RedirectView SSOLogin(@RequestParam(required = false) String userName, @RequestParam(required = false) String orgid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String token) {
+    public RedirectView SSOLogin(@RequestParam(required = false) String userName, @RequestParam(required = false) String orgid, @RequestParam(required = false) String campusid, @RequestParam(required = false) String deptId, @RequestParam(required = false) String token) {
         if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(token)) {
             throw new BaseException("鍙傛暟涓嶈兘涓虹┖");
         }
@@ -151,8 +151,8 @@
             RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
             userName = rsaPublicKeyExample.decryptedData(userName, pri_key);
         }
-
-        String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId);
+        if (StringUtils.isEmpty(deptId)) deptId = "null";
+        String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId + "&" + campusid);
         if (StringUtils.isEmpty(token2)) {
             throw new BaseException("鐧婚檰澶辫触");
         }

--
Gitblit v1.9.3