From 860afb8738886b9ae52b2fb95d6ba1b9d26134b3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 07 十二月 2023 15:17:48 +0800
Subject: [PATCH] update 优化 将 OSS配置 改为全局模式 降低使用难度 保留sql便于用户自行扩展(常规项目用不上配置分多租户)
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java
index d9dcb40..967612e 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java
@@ -72,7 +72,7 @@
return CollUtil.newArrayList();
}
// 娉ㄦ剰姝ゅ涓嶈浣跨敤 .toList() 鏂拌娉� 鍥犱负杩斿洖鐨勬槸涓嶅彲鍙楲ist 浼氬鑷村簭鍒楀寲闂
- return collection.stream().sorted(comparing).collect(Collectors.toList());
+ return collection.stream().filter(Objects::nonNull).sorted(comparing).collect(Collectors.toList());
}
/**
@@ -89,7 +89,7 @@
if (CollUtil.isEmpty(collection)) {
return MapUtil.newHashMap();
}
- return collection.stream().collect(Collectors.toMap(key, Function.identity(), (l, r) -> l));
+ return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, Function.identity(), (l, r) -> l));
}
/**
@@ -108,7 +108,7 @@
if (CollUtil.isEmpty(collection)) {
return MapUtil.newHashMap();
}
- return collection.stream().collect(Collectors.toMap(key, value, (l, r) -> l));
+ return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, value, (l, r) -> l));
}
/**
@@ -126,7 +126,7 @@
return MapUtil.newHashMap();
}
return collection
- .stream()
+ .stream().filter(Objects::nonNull)
.collect(Collectors.groupingBy(key, LinkedHashMap::new, Collectors.toList()));
}
@@ -147,7 +147,7 @@
return MapUtil.newHashMap();
}
return collection
- .stream()
+ .stream().filter(Objects::nonNull)
.collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.groupingBy(key2, LinkedHashMap::new, Collectors.toList())));
}
@@ -168,7 +168,7 @@
return MapUtil.newHashMap();
}
return collection
- .stream()
+ .stream().filter(Objects::nonNull)
.collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.toMap(key2, Function.identity(), (l, r) -> l)));
}
--
Gitblit v1.9.3