From 693a33f660891c98b8b95490d020c428c5da9871 Mon Sep 17 00:00:00 2001
From: 抓蛙师 <770492966@qq.com>
Date: 星期一, 19 九月 2022 21:46:32 +0800
Subject: [PATCH] 完善功能：前端可以配置多排序参数支持依次排序 如：{isAsc:"asc",orderByColumn:"id"} {isAsc:"asc",orderByColumn:"id,createTime"} {isAsc:"asc,desc",orderByColumn:"id,createTime"} 共三种配置方式
---
ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java
index 76c60e8..c852ce6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java
@@ -1,6 +1,5 @@
package com.ruoyi.common.excel;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import lombok.Setter;
@@ -64,15 +63,11 @@
if (successCount == 0) {
return "璇诲彇澶辫触锛屾湭瑙ｆ瀽鍒版暟鎹�";
} else {
- if (errorList.size() == 0) {
+ if (errorCount == 0) {
return StrUtil.format("鎭枩鎮紝鍏ㄩ儴璇诲彇鎴愬姛锛佸叡{}鏉�", successCount);
} else {
- return StrUtil.format("閮ㄥ垎璇诲彇鎴愬姛锛屽叾涓垚鍔焮}鏉★紝澶辫触{}鏉★紝閿欒淇℃伅濡備笅锛�<br/>{}",
- successCount,
- errorCount,
- CollUtil.join(errorList, "<br/>"));
+ return "";
}
-
}
}
}
--
Gitblit v1.9.3