修复bug

9d6ae6e7 · yanzg · 5d50db83 · 9d6ae6e7
Commit 9d6ae6e7 authored May 07, 2022 by yanzg
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

ArrayHelper.java ...rc/main/java/com/yanzuoguang/util/helper/ArrayHelper.java +8 -7

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
@@ -20,15 +20,16 @@ public class ArrayHelper {
     */
    public static <T extends Object> List<T> megerNotEmpty(T from, Collection<T>... froms) {
        List<T> tos = new ArrayList<>();
-        if (!StringHelper.isEmpty(from)) {
+        if (from != null && !StringHelper.isEmpty(from)) {
            tos.add(from);
        }
-        if (froms != null) {
+        if (froms == null) {
-            for (Collection<T> list : froms) {
+            return tos;
-                for (T item : list) {
+        }
-                    if (!StringHelper.isEmpty(item)) {
+        for (Collection<T> list : froms) {
-                        tos.add(item);
+            for (T item : list) {
-                    }
+                if (!StringHelper.isEmpty(item)) {
+                    tos.add(item);
                }
            }
        }