From b528f0bd146769407de4b7da223e75d46b51d345 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 24 一月 2025 13:06:31 +0800
Subject: [PATCH] 🧨🧨🧨发布 5.3.0 新春版 祝大家新年快乐

---
 ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java |   46 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java
index e0de69a..93617b0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java
@@ -15,28 +15,46 @@
 public class ObjectUtils extends ObjectUtil {
 
     /**
-     * 濡傛灉瀵硅薄涓嶄负绌猴紝鍒欒幏鍙栧璞′腑鐨勬煇涓瓧娈�
-     * <p>
-     * 渚嬶細
-     * <code>
-     * <p>    public class User {
-     * <p>        private String name;
-     * <p>        // 鐪佺暐 getter/setter
-     * <p>    }
-     * </code>
-     * <code>
-     * <p>    User user = userService.queryById(userId);
-     * <p>    String name = ObjectUtils.notNullGetter(user,User::getName);
-     * </code>
+     * 濡傛灉瀵硅薄涓嶄负绌猴紝鍒欒幏鍙栧璞′腑鐨勬煇涓瓧娈� ObjectUtils.notNullGetter(user, User::getName);
+     *
      * @param obj 瀵硅薄
      * @param func 鑾峰彇鏂规硶
      * @return 瀵硅薄瀛楁
      */
-    public static <T,E> E notNullGetter(T obj, Function<T,E> func) {
+    public static <T, E> E notNullGetter(T obj, Function<T, E> func) {
         if (isNotNull(obj) && isNotNull(func)) {
             return func.apply(obj);
         }
         return null;
     }
 
+    /**
+     * 濡傛灉瀵硅薄涓嶄负绌猴紝鍒欒幏鍙栧璞′腑鐨勬煇涓瓧娈碉紝鍚﹀垯杩斿洖榛樿鍊�
+     *
+     * @param obj          瀵硅薄
+     * @param func         鑾峰彇鏂规硶
+     * @param defaultValue 榛樿鍊�
+     * @return 瀵硅薄瀛楁
+     */
+    public static <T, E> E notNullGetter(T obj, Function<T, E> func, E defaultValue) {
+        if (isNotNull(obj) && isNotNull(func)) {
+            return func.apply(obj);
+        }
+        return defaultValue;
+    }
+
+    /**
+     * 濡傛灉鍊间笉涓虹┖锛屽垯杩斿洖鍊硷紝鍚﹀垯杩斿洖榛樿鍊�
+     *
+     * @param obj          瀵硅薄
+     * @param defaultValue 榛樿鍊�
+     * @return 瀵硅薄瀛楁
+     */
+    public static <T> T notNull(T obj, T defaultValue) {
+        if (isNotNull(obj)) {
+            return obj;
+        }
+        return defaultValue;
+    }
+
 }

--
Gitblit v1.9.3