Procházet zdrojové kódy

fix:
execl导入读写失败
feat:
新增删除过期导入任务

18339543638 před 2 roky
rodič
revize
49fc295fd8

+ 1 - 1
tr-modules-api/tr-module-export-api/src/main/java/cn/tr/module/export/handler/AbstractCascadeSelectConverter.java

@@ -33,7 +33,7 @@ public abstract class AbstractCascadeSelectConverter<T> implements Converter<T>
 
     @Override
     public T convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
-        if(cellData==null||StrUtil.isEmpty(cellData.getStringValue())||ObjectUtil.isNull(cellData.getNumberValue())){
+        if(cellData==null||(StrUtil.isEmpty(cellData.getStringValue())&&ObjectUtil.isNull(cellData.getNumberValue()))){
             return null;
         }
         CellDataTypeEnum type = cellData.getType();