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 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());