From 2cfa20c70ea84fa3435f3fd1e653c5ae60a3fc1e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 06 一月 2026 16:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 2 +-
1 files changed, 1 insertions(+), 1 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..55d14d9 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
@@ -151,7 +151,7 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
userName = rsaPublicKeyExample.decryptedData(userName, pri_key);
}
-
+ if (StringUtils.isEmpty(deptId)) deptId = "null";
String token2 = loginService.loginByUserName(userName + "&" + orgid + "&" + deptId);
if (StringUtils.isEmpty(token2)) {
throw new BaseException("鐧婚檰澶辫触");
--
Gitblit v1.9.3