18339543638 2 лет назад
Родитель
Сommit
05112cb2e4

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

@@ -3,10 +3,8 @@ package cn.tr.module.export.handler;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.tr.module.export.annotation.ExcelPropertySupport;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.data.ReadCellData;
@@ -113,7 +111,7 @@ public abstract class AbstractSelectConverter<T> implements Converter<T> {
     public String buildContent(T javaValue,Collection<String> params){
         List<Pair<T, String>> pairs = doComboList(params);
         for (Pair<T, String> pair : pairs) {
-            if (ObjectUtil.equals(javaValue, pair.getKey())) {
+            if (ObjectUtil.equals(javaValue, pair.getValue())) {
                 return buildContent(pair.getValue(),pair.getKey());
             }
         }

+ 1 - 1
tr-modules/tr-module-export/src/main/java/cn/tr/module/excel/sheet/service/impl/SysExportSheetServiceImpl.java

@@ -72,7 +72,7 @@ public class SysExportSheetServiceImpl implements ISysExportSheetService {
             }
         }
         if (SheetImportStatus.parsingSuccess.getValue().equals(result.getStatus()) &&
-                (ObjectUtil.equals(result.getTotalCount(), result.getSuccessCount() * result.getFailCount()))) {
+                (ObjectUtil.equals(result.getTotalCount(), result.getSuccessCount() + result.getFailCount()))) {
             result.setStatus(SheetImportStatus.importSuccess.getValue());
             baseRepository.updateById(SysExportSheetMapper.INSTANCE.convertPO(result));
         }