Merge branch 'ver1.1' of http://192.168.0.204/yzg/yzg-util

4b8ef624 · yanzg · d47a7fcf · f701152c · 4b8ef624
Commit 4b8ef624 authored Sep 08, 2022 by yanzg
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

ArrayHelper.java ...rc/main/java/com/yanzuoguang/util/helper/ArrayHelper.java +3 -0

No files found.
--- a/yzg-util-base/src/main/java/com/yanzuoguang/util/helper/ArrayHelper.java
+++ b/yzg-util-base/src/main/java/com/yanzuoguang/util/helper/ArrayHelper.java
@@ -29,6 +29,9 @@ public class ArrayHelper {
            return tos;
        }
        for (Collection<T> list : froms) {
+            if (list == null) {
+                continue;
+            }
            for (T item : list) {
                if (!StringHelper.isEmpty(item)) {
                    tos.add(item);