From 70bf1a48d037f993021ddf4ee2ee6da3bbce351e Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:51:52 +0800
Subject: [PATCH] !481 单元格合并可以基于注解选择哪些其他字段需要同时相等方可进行该单元格合并 * excel插件 原有的合并策略写死了根据前一字段是否一致来判断后一字段的合并 感觉这样不灵活 如有特殊需求 字段排序不规整 于是扩充了注解的…
---
ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..a75b913 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
@@ -4,6 +4,7 @@
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.system.domain.SysClient;
+import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.web.domain.vo.LoginVo;
/**
@@ -17,21 +18,29 @@
/**
* 鐧诲綍
+ *
+ * @param body 鐧诲綍瀵硅薄
+ * @param client 鎺堟潈绠＄悊瑙嗗浘瀵硅薄
+ * @param grantType 鎺堟潈绫诲瀷
+ * @return 鐧诲綍楠岃瘉淇℃伅
*/
- static LoginVo login(String body, SysClient client, String grantType) {
+ static LoginVo login(String body, SysClientVo 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);
}
/**
* 鐧诲綍
+ *
+ * @param body 鐧诲綍瀵硅薄
+ * @param client 鎺堟潈绠＄悊瑙嗗浘瀵硅薄
+ * @return 鐧诲綍楠岃瘉淇℃伅
*/
- LoginVo login(String clientId, String body, SysClient client);
+ LoginVo login(String body, SysClientVo client);
}
--
Gitblit v1.9.3