|
|
@@ -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();
|