From 663e22ac294acf7a26ab2307b04ddd24700fd88b Mon Sep 17 00:00:00 2001
From: Simple <2424585654@qq.com>
Date: 星期二, 12 十二月 2023 16:58:24 +0800
Subject: [PATCH] fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并
---
ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
index 33c4a34..d4f9c73 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
@@ -20,18 +20,17 @@
*/
static LoginVo login(String body, SysClient client, String grantType) {
// 鎺堟潈绫诲瀷鍜屽鎴风id
- String clientId = client.getClientId();
String beanName = grantType + BASE_NAME;
if (!SpringUtils.containsBean(beanName)) {
throw new ServiceException("鎺堟潈绫诲瀷涓嶆纭�!");
}
IAuthStrategy instance = SpringUtils.getBean(beanName);
- return instance.login(clientId, body, client);
+ return instance.login(body, client);
}
/**
* 鐧诲綍
*/
- LoginVo login(String clientId, String body, SysClient client);
+ LoginVo login(String body, SysClient client);
}
--
Gitblit v1.9.3