Преглед на файлове

fix:
文件导入导出BUG修复

18339543638 преди 2 години
родител
ревизия
43a7448862

+ 2 - 4
tr-modules-api/tr-module-export-api/src/main/java/cn/tr/module/export/handler/AbstractSelectConverter.java

@@ -40,10 +40,8 @@ public abstract class AbstractSelectConverter<T> implements Converter<T> {
         String content = cellData.getStringValue();
         //校验是否存在
         T uniqueCode = extractUniqueCode(content,getParams(excelPropertySupport));
-        boolean result = existUniqueCode(uniqueCode, getParams(excelPropertySupport));
-        if(!result){
-            ExcelProperty excelProperty = contentProperty.getField().getAnnotation(ExcelProperty.class);
-            throw new UnsupportedOperationException("列:"+excelProperty.value()+",所填值不合法,请重新下载模板导入");
+        if(ObjectUtil.isNull(uniqueCode)){
+            throw new UnsupportedOperationException("所填值{"+content+"}不合法,请重新下载模板导入");
         }
         return uniqueCode;
     }

+ 1 - 1
tr-modules/tr-module-export/src/main/java/cn/tr/module/excel/core/handler/read/CustomerReadListener.java

@@ -73,7 +73,7 @@ public class CustomerReadListener<T> implements ReadListener<T> {
             throw exception;
         }
         Integer rowIndex = context.readRowHolder().getRowIndex();
-        ExcelRowDataDTO rowData = ExcelRowDataDTO.fail(exception.getMessage(), sheetId, rowIndex,CollectionUtil.size(fieldMap),(Map<String, Object>) context.getCustom());
+        ExcelRowDataDTO rowData = ExcelRowDataDTO.fail(exception.getCause().getMessage(), sheetId, rowIndex,CollectionUtil.size(fieldMap),(Map<String, Object>) context.getCustom());
         publishMsg(rowData);
     }