From d696ed98415d88f17047644e3f77a1ef50a48d5f Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期五, 17 二月 2023 10:49:21 +0800
Subject: [PATCH] update test.sql 更新测试 SQL 增加租户id ; update 更新 TestDemo, TestTree 实体继承 ; fix 修正 TestDemoVo 注解标注错误导致的修改异常 ;
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java
index b11fa51..28fce35 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java
@@ -30,6 +30,7 @@
if (CollUtil.isEmpty(collection)) {
return CollUtil.newArrayList();
}
+ // 娉ㄦ剰姝ゅ涓嶈浣跨敤 .toList() 鏂拌娉� 鍥犱负杩斿洖鐨勬槸涓嶅彲鍙楲ist 浼氬鑷村簭鍒楀寲闂
return collection.stream().filter(function).collect(Collectors.toList());
}
@@ -41,7 +42,7 @@
* @return 鎷兼帴鍚庣殑list
*/
public static <E> String join(Collection<E> collection, Function<E, String> function) {
- return join(collection, function, ",");
+ return join(collection, function, StringUtils.SEPARATOR);
}
/**
@@ -70,6 +71,7 @@
if (CollUtil.isEmpty(collection)) {
return CollUtil.newArrayList();
}
+ // 娉ㄦ剰姝ゅ涓嶈浣跨敤 .toList() 鏂拌娉� 鍥犱负杩斿洖鐨勬槸涓嶅彲鍙楲ist 浼氬鑷村簭鍒楀寲闂
return collection.stream().sorted(comparing).collect(Collectors.toList());
}
@@ -188,6 +190,7 @@
.stream()
.map(function)
.filter(Objects::nonNull)
+ // 娉ㄦ剰姝ゅ涓嶈浣跨敤 .toList() 鏂拌娉� 鍥犱负杩斿洖鐨勬槸涓嶅彲鍙楲ist 浼氬鑷村簭鍒楀寲闂
.collect(Collectors.toList());
}
--
Gitblit v1.9.3