diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
index 32e17888e..1ac34b6bb 100755
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
@@ -363,7 +363,7 @@ public class CollUtil {
 	 * 例如：集合1：[a, b, c, c, c]，集合2：[a, b, c, c]<br>
 	 * 结果：[a, b, c]，此结果中只保留了一个c
 	 *
-	 * @param <T>   集合元素类型
+	 * @param <T>        集合元素类型
 	 * @param colls 集合列表
 	 * @return 交集的集合，返回 {@link LinkedHashSet}
 	 * @since 5.3.9
@@ -1078,16 +1078,13 @@ public class CollUtil {
 	 * @since 5.3.5
 	 */
 	public static <T, R> List<R> map(final Iterable<T> collection, final Function<? super T, ? extends R> mapper, final boolean ignoreNull) {
-		if (ignoreNull) {
-			return StreamUtil.of(collection)
-					// 检查映射前的结果
-					.filter(Objects::nonNull)
-					.map(mapper)
-					// 检查映射后的结果
-					.filter(Objects::nonNull)
-					.collect(Collectors.toList());
-		}
-		return StreamUtil.of(collection).map(mapper).collect(Collectors.toList());
+		return StreamUtil.of(collection)
+				// 检查映射前的结果
+				.filter((e) -> (false == ignoreNull) || null != e)
+				.map(mapper)
+				// 检查映射后的结果
+				.filter((e) -> (false == ignoreNull) || null != e)
+				.collect(Collectors.toList());
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java
index 83c0165a6..10ac0d8b0 100755
--- a/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/ListUtil.java
@@ -433,7 +433,7 @@ public class ListUtil {
 	 * @param element 新元素
 	 * @param paddingElement 填充的值
 	 * @return 原List
-	 * @since 5.8.4
+	 * @since 5。8.4
 	 */
 	public static <T> List<T> setOrPadding(final List<T> list, final int index, final T element, final T paddingElement) {
 		Assert.notNull(list, "List must be not null !");
diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
index 7f9d93147..0df22861f 100755
--- a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
@@ -1028,7 +1028,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 	 * @param <T>   数组元素类型
 	 * @param array 数组对象
 	 * @param index 下标，支持负数
-	 * @return 值，越界返回null
+	 * @return 值
 	 * @since 4.0.6
 	 */
 	@SuppressWarnings("unchecked")
@@ -1037,14 +1037,14 @@ public class ArrayUtil extends PrimitiveArrayUtil {
 			return null;
 		}
 
-		final int length = Array.getLength(array);
 		if (index < 0) {
-			index += length;
+			index += Array.getLength(array);
 		}
-		if (index < 0 || index >= length) {
+		try {
+			return (T) Array.get(array, index);
+		} catch (final ArrayIndexOutOfBoundsException e) {
 			return null;
 		}
-		return (T) Array.get(array, index);
 	}
 
 	/**