From 4f92c0317ea77262999bd31a11e9556890d4b932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 12 Nov 2024 10:50:10 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E6=84=8F=E4=B9=89=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/common/core/utils/ObjectUtils.java  | 13 -------------
 .../mybatis/handler/InjectionMetaObjectHandler.java |  5 ++++-
 2 files changed, 4 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 82faf2c57..93617b018 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
@@ -43,19 +43,6 @@ public class ObjectUtils extends ObjectUtil {
         return defaultValue;
     }
 
-    /**
-     * 如果值不为空，则返回值
-     *
-     * @param obj          对象
-     * @return 对象字段
-     */
-    public static <T> T notNull(T obj) {
-        if (isNotNull(obj)) {
-            return obj;
-        }
-        return null;
-    }
-
     /**
      * 如果值不为空，则返回值，否则返回默认值
      *
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java
index 85ef2e97a..fec25792a 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java
@@ -71,7 +71,10 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler {
                 baseEntity.setUpdateTime(current);
 
                 // 获取当前登录用户的ID，并填充更新人信息
-                baseEntity.setUpdateBy(ObjectUtils.notNull(LoginHelper.getUserId()));
+                Long userId = LoginHelper.getUserId();
+                if (ObjectUtil.isNotNull(userId)) {
+                    baseEntity.setUpdateBy(userId);
+                }
             } else {
                 this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
             }