From 743f59873deea9f7c023c2924afaf4ad0006eb23 Mon Sep 17 00:00:00 2001
From: zegezy <1098696801@qq.com>
Date: Fri, 17 May 2024 07:35:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?saveOrUpdate=20insert=E6=97=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=AE=BE=E7=BD=AEid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../magicboot/interceptor/NamedTableHandlerInterceptor.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java b/src/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java
index 3365c57..92c826d 100644
--- a/src/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java
+++ b/src/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java
@@ -18,7 +18,8 @@ public class NamedTableHandlerInterceptor implements NamedTableInterceptor {
     public void preHandle(SqlMode sqlMode, NamedTable namedTable) {
         if(Boolean.TRUE == namedTable.getAttribute(COMMON_FIELD)){
             if(sqlMode == SqlMode.INSERT) {
-                String id = IdUtil.simpleUUID();
+                Object primaryValue = namedTable.getColumns().get(namedTable.getPrimary());
+                String id = null != primaryValue && !"".equals(primaryValue.toString()) ? primaryValue.toString() : IdUtil.simpleUUID();
                 namedTable.setAttribute(namedTable.getPrimary(), id);
                 namedTable.column(namedTable.getPrimary(), id);
                 namedTable.column(CREATE_BY, StpUtil.getLoginId());

From 0cfcda0b3f71b491c995075578eed0963842f5d8 Mon Sep 17 00:00:00 2001
From: zegezy <1098696801@qq.com>
Date: Fri, 17 May 2024 07:35:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=BB=84=E4=BB=B6=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=87=E6=B3=A8=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/magic-api/api/系统管理/日志管理/操作日志.ms | 4 ++--
 data/magic-api/api/系统管理/组件/保存tree.ms     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/magic-api/api/系统管理/日志管理/操作日志.ms b/data/magic-api/api/系统管理/日志管理/操作日志.ms
index 9303cf2..c3d99bc 100644
--- a/data/magic-api/api/系统管理/日志管理/操作日志.ms
+++ b/data/magic-api/api/系统管理/日志管理/操作日志.ms
@@ -5,7 +5,7 @@
   "groupId" : "9ec6f9ec92d24a369952bb13eddc134f",
   "name" : "操作日志",
   "createTime" : null,
-  "updateTime" : 1649001507013,
+  "updateTime" : 1713861312162,
   "lock" : "0",
   "createBy" : null,
   "updateBy" : null,
@@ -260,5 +260,5 @@ return db.page("""
     ?{createDate && createDate.split(',')[1], and sol.create_date <= #{createDate.split(',')[1]}}
     ?{costTime && costTime.split(',')[0], and sol.cost_time >= #{costTime.split(',')[0]}}
     ?{costTime && costTime.split(',')[1], and sol.cost_time <= #{costTime.split(',')[1]}}
-    order by create_date desc
+    order by sol.create_date desc
 """)
\ No newline at end of file
diff --git a/data/magic-api/api/系统管理/组件/保存tree.ms b/data/magic-api/api/系统管理/组件/保存tree.ms
index fb4526c..26ca2ad 100644
--- a/data/magic-api/api/系统管理/组件/保存tree.ms
+++ b/data/magic-api/api/系统管理/组件/保存tree.ms
@@ -65,4 +65,4 @@ if(id){
 }
 data.type = type
 data.remark = remark
-return db.table("sys_dynamic_component").primary("id").saveOrUpdate(data)
\ No newline at end of file
+return db.table("sys_dynamic_component").primary("id").withBlank().saveOrUpdate(data)
\ No newline at end of file