From 5d577a99a6a1ac90aa6938f28199fae269f798b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com> Date: Wed, 29 Dec 2021 17:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7s8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- magic-boot/pom.xml | 2 +- .../extension/NamedTableFunctionExtension.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/magic-boot/pom.xml b/magic-boot/pom.xml index 467f269..2662ea1 100644 --- a/magic-boot/pom.xml +++ b/magic-boot/pom.xml @@ -14,7 +14,7 @@ magic-boot 1.8 - 1.6.3 + 1.7.2 1.2.1 5.7.13 1.26.0 diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java b/magic-boot/src/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java index f40647d..d233772 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java @@ -5,6 +5,7 @@ import org.ssssssss.magicapi.modules.table.NamedTable; import org.ssssssss.magicboot.model.MagicBootConstants; import org.ssssssss.script.annotation.Comment; import org.ssssssss.script.functions.ExtensionMethod; +import org.ssssssss.script.runtime.RuntimeContext; import java.util.Map; @@ -17,15 +18,15 @@ public class NamedTableFunctionExtension implements ExtensionMethod { } @Comment("保存到表中,当主键有值时则修改,否则插入") - public static Object saveOrUpdate(NamedTable namedTable, @Comment("各项列和值") Map data){ + public static Object saveOrUpdate(NamedTable namedTable, RuntimeContext runtimeContext, @Comment("各项列和值") Map data){ namedTable.setAttribute(MagicBootConstants.COMMON_FIELD, true); - namedTable.save(data,true); + namedTable.save(runtimeContext, data,true); return namedTable.getAttribute(MagicBootConstants.ID); } @Comment("保存到表中,当主键有值时则修改,否则插入") - public static Object saveOrUpdate(NamedTable namedTable){ - return saveOrUpdate(namedTable, null); + public static Object saveOrUpdate(NamedTable namedTable, RuntimeContext runtimeContext){ + return saveOrUpdate(namedTable, runtimeContext, null); } -} \ No newline at end of file +}