Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17

YunaiV
2 parents e693ac19 e6a3a14f
Showing 2 changed files with 23 additions and 0 deletions
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/AreaConvert.java
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
@@ -7,6 +7,7 @@ import cn.idev.excel.converters.Converter;
 import cn.idev.excel.enums.CellDataTypeEnum;
 import cn.idev.excel.metadata.GlobalConfiguration;
 import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
 import cn.idev.excel.metadata.property.ExcelContentProperty;
 import lombok.extern.slf4j.Slf4j;
@@ -43,4 +44,21 @@ public class AreaConvert implements Converter&lt;Object&gt; {
         return Convert.convert(fieldClazz, area.getId());
     }
+    @Override
+    public WriteCellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty,
+                                                    GlobalConfiguration globalConfiguration) {
+        // 空时，返回空
+        if (object == null) {
+            return new WriteCellData<>("");
+        }
+        // 将地区编号转换成地区全路径（与 convertToJavaData 的 parseArea 对应，使用 "/" 分隔）
+        Integer id = Convert.convert(Integer.class, object);
+        String path = AreaUtils.format(id, "/");
+        if (path == null) {
+            log.error("[convertToExcelData][id({}) 转换不了]", id);
+            return new WriteCellData<>("");
+        }
+        return new WriteCellData<>(path);
+    }
+
 }
@@ -133,6 +133,11 @@ public class SelectSheetWriteHandler implements SheetWriteHandler {
         DataValidationHelper helper = writeSheetHolder.getSheet().getDataValidationHelper(); // 需要设置下拉框的 sheet 页的数据验证助手
         Workbook workbook = writeWorkbookHolder.getWorkbook(); // 获得工作簿
         List<KeyValue<Integer, List<String>>> keyValues = convertList(selectMap.entrySet(), entry -> new KeyValue<>(entry.getKey(), entry.getValue()));
+        // 空字典/空选项源：跳过该列下拉，避免拼出 $F$1:$F$0 非法区间致 POI FormulaParseException（该列退化为普通文本列）
+        keyValues.removeIf(item -> CollUtil.isEmpty(item.getValue()));
+        if (CollUtil.isEmpty(keyValues)) {
+            return; // 全部为空时连「字典sheet」都不创建
+        }
         keyValues.sort(Comparator.comparing(item -> item.getValue().size())); // 升序不然创建下拉会报错
         // 2. 创建数据字典的 sheet 页