人机材修改

wangqian
1 parent 5a94fa34
Showing 2 changed files with 3 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/CostFeeController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.java
@@ -286,12 +286,12 @@ public class CostFeeController{
             }
             // 关键：移除最后一行（以“说明”开头的行）
             removeLastLineIfStartWithExplain(dataList, importClass);
-            // 基础数据校验（非空、格式等）
-            costFeeService.validateImportData(dataList, template);
         } catch (IOException e) {
             log.error(e.getMessage());
         }
+        // 基础数据校验（非空、格式等）
+        costFeeService.validateImportData(dataList, template);
         return new ImportResult<>(dataList, template.isNeedPreview());
     }
     /**
@@ -727,7 +727,7 @@ public class CostFeeServiceImpl implements CostFeeService {
                         if (totalWeight > 100) {
                             throw exception0(BAD_REQUEST.getCode(), String.format(
-                                    "第%d条数据：权重值合计不能大于100%", rowNum, totalWeight
+                                    "第%d条数据：权重值合计不能大于100%%", rowNum, totalWeight
                             ));
                         }
                     }