From a728e96e1185585ea7ca047723693c6eab9a4b3c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sun, 14 Jun 2026 18:48:12 +0800
Subject: [PATCH] =?UTF-8?q?perf(Xpack):=20=E4=BB=A3=E7=A0=81=E6=B7=B7?=
 =?UTF-8?q?=E6=B7=86=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/config/JpaUpdateNonNullAspect.java   |  4 ++--
 de-xpack                                             |  2 +-
 .../src/main/java/io/dataease/utils/LogUtil.java     | 12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/config/JpaUpdateNonNullAspect.java b/core/core-backend/src/main/java/io/dataease/config/JpaUpdateNonNullAspect.java
index 0c08c61a4a..57cab10195 100644
--- a/core/core-backend/src/main/java/io/dataease/config/JpaUpdateNonNullAspect.java
+++ b/core/core-backend/src/main/java/io/dataease/config/JpaUpdateNonNullAspect.java
@@ -70,7 +70,7 @@ public class JpaUpdateNonNullAspect {
                 return dbEntity;
             }
         } catch (Exception e) {
-            System.out.println("合并实体属性失败: " + e.getMessage());
+            LogUtil.error("合并实体属性失败", e);
         }
         return entity;
     }
@@ -127,7 +127,7 @@ public class JpaUpdateNonNullAspect {
                     setter.invoke(target, value);
                 }
             } catch (Exception e) {
-                LogUtil.error(e);
+                LogUtil.error("copyNonNullProperties 复制属性失败: " + pd.getName(), e);
                 throw new RuntimeException("copyNonNullProperties 复制属性失败: " + pd.getName(), e);
             }
         }
diff --git a/de-xpack b/de-xpack
index 4a94cc3103..e2f6f8b6b7 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 4a94cc31038d6020c1b6bc2431c00c190fc6d604
+Subproject commit e2f6f8b6b73df5b3fadf23a04445f82c80dc0618
diff --git a/sdk/common/src/main/java/io/dataease/utils/LogUtil.java b/sdk/common/src/main/java/io/dataease/utils/LogUtil.java
index ffaecd0706..f3f3fca879 100644
--- a/sdk/common/src/main/java/io/dataease/utils/LogUtil.java
+++ b/sdk/common/src/main/java/io/dataease/utils/LogUtil.java
@@ -40,7 +40,11 @@ public class LogUtil {
             }
         } else if (ERROR.equals(level)) {
             if (logger != null && logger.isErrorEnabled()) {
-                logger.error(LogUtil.getMsg(msg));
+                if (msg instanceof Throwable) {
+                    logger.error(LogUtil.getMsg(msg), (Throwable) msg);
+                } else {
+                    logger.error(LogUtil.getMsg(msg));
+                }
             }
         } else {
             if (logger != null && logger.isErrorEnabled()) {
@@ -136,7 +140,11 @@ public class LogUtil {
     public static void error(Object msg) {
         Logger logger = LogUtil.getLogger();
         if (logger != null && logger.isErrorEnabled()) {
-            logger.error(LogUtil.getMsg(msg));// 并追加方法名称
+            if (msg instanceof Throwable) {
+                logger.error(LogUtil.getMsg(msg), (Throwable) msg);
+            } else {
+                logger.error(LogUtil.getMsg(msg));
+            }
         }
     }