diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java index 684b16a6..414a03af 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java @@ -374,7 +374,7 @@ public class SQLModule extends HashMap implements MagicModule * 插入并返回主键 */ @Comment("执行insert操作,返回插入主键") - public long insert(@Comment("`SQL`语句或`xml`") String sqlOrXml) { + public Object insert(@Comment("`SQL`语句或`xml`") String sqlOrXml) { return insert(sqlOrXml, (Map) null); } @@ -382,10 +382,10 @@ public class SQLModule extends HashMap implements MagicModule * 插入并返回主键,并传入变量信息 */ @Comment("执行insert操作,并传入变量信息,返回插入主键") - public long insert(@Comment("`SQL`语句或`xml`") String sqlOrXml, @Comment("变量信息")Map params) { + public Object insert(@Comment("`SQL`语句或`xml`") String sqlOrXml, @Comment("变量信息")Map params) { MagicKeyHolder magicKeyHolder = new MagicKeyHolder(); insert(new BoundSql(sqlOrXml, params,this), magicKeyHolder); - return magicKeyHolder.getLongKey(); + return magicKeyHolder.getObjectKey(); } /** @@ -633,18 +633,7 @@ public class SQLModule extends HashMap implements MagicModule return connection.prepareStatement(sql, new String[]{primary}); } - public long getLongKey() throws InvalidDataAccessApiUsageException, DataRetrievalFailureException { - Number key = super.getKey(); - if (key == null) { - return -1; - } - return key.longValue(); - } - public Object getObjectKey() { - if (useGeneratedKeys) { - return getLongKey(); - } List> keyList = getKeyList(); if (keyList.isEmpty()) { return null;