diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDynamicOptions.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDynamicOptions.java index b0160b5b9..c26bd68ff 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDynamicOptions.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDynamicOptions.java @@ -1,5 +1,7 @@ package org.dromara.common.excel.annotation; +import org.dromara.common.excel.core.ExcelOptionsProvider; + import java.lang.annotation.*; /** @@ -14,7 +16,8 @@ public @interface ExcelDynamicOptions { /** * 提供者类全限定名 - * 实现org.dromara.common.excel.service.ExcelOptionsProvider实现类接口 + *
+ * {@link org.dromara.common.excel.core.ExcelOptionsProvider} 接口实现类 class
*/
- Class> providerClass();
+ Class extends ExcelOptionsProvider> providerClass();
}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java
index b94c51410..05c79c410 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java
@@ -25,7 +25,6 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.annotation.ExcelDynamicOptions;
import org.dromara.common.excel.annotation.ExcelEnumFormat;
-import org.dromara.common.excel.service.ExcelOptionsProvider;
import java.lang.reflect.Field;
import java.util.*;
@@ -122,15 +121,12 @@ public class ExcelDownHandler implements SheetWriteHandler {
} else if (field.isAnnotationPresent(ExcelDynamicOptions.class)) {
// 处理动态下拉选项
ExcelDynamicOptions dynamicOptions = field.getDeclaredAnnotation(ExcelDynamicOptions.class);
- Class> providerClass = dynamicOptions.providerClass();
- if (providerClass == null) {
- throw new ServiceException("使用ExcelDynamicOptions注解,必须给providerClass赋予ExcelOptionsProvider的实现类" +
- ",字段:{}", field.getName());
- }
// 获取提供者实例
- ExcelOptionsProvider provider = (ExcelOptionsProvider) SpringUtils.getBean(providerClass);
- Set