From 1d98835d2439a63c48fcbe17b45bfbc1fcdd01af Mon Sep 17 00:00:00 2001
From: mxd <838425805@qq.com>
Date: Thu, 14 Oct 2021 22:33:03 +0800
Subject: [PATCH] fix

---
 .../spring/boot/starter/MagicAPIAutoConfiguration.java        | 1 +
 .../main/java/org/ssssssss/magicapi/modules/SQLModule.java    | 2 +-
 .../java/org/ssssssss/magicapi/modules/table/NamedTable.java  | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
index f5a62ae3..43a552ba 100644
--- a/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
+++ b/magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
@@ -389,6 +389,7 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
 	 * 注入API调用Service
 	 */
 	@Bean
+	@ConditionalOnMissingBean
 	public MagicAPIService magicAPIService(MappingHandlerMapping mappingHandlerMapping,
 										   ApiServiceProvider apiServiceProvider,
 										   FunctionServiceProvider functionServiceProvider,
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 b028adc4..d7e57260 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
@@ -523,7 +523,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
 
 	@Comment("指定table，进行单表操作")
 	public NamedTable table(String tableName) {
-		return new NamedTable(tableName, this, rowMapColumnMapper);
+		return new NamedTable(tableName, this, rowMapColumnMapper, namedTableInterceptors);
 	}
 
 	private BoundSql buildPageBoundSql(Dialect dialect, BoundSql boundSql, long offset, long limit) {
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java
index 16f19837..89aa6b37 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java
@@ -58,10 +58,11 @@ public class NamedTable extends Attributes<Object> {
 
 	Where where = new Where(this);
 
-	public NamedTable(String tableName, SQLModule sqlModule, Function<String, String> rowMapColumnMapper) {
+	public NamedTable(String tableName, SQLModule sqlModule, Function<String, String> rowMapColumnMapper, List<NamedTableInterceptor> namedTableInterceptors) {
 		this.tableName = tableName;
 		this.sqlModule = sqlModule;
 		this.rowMapColumnMapper = rowMapColumnMapper;
+		this.namedTableInterceptors = namedTableInterceptors;
 		this.logicDeleteColumn = sqlModule.getLogicDeleteColumn();
 		String deleteValue = sqlModule.getLogicDeleteValue();
 		this.logicDeleteValue = deleteValue;
@@ -102,6 +103,7 @@ public class NamedTable extends Attributes<Object> {
 		namedTable.withBlank = this.withBlank;
 		namedTable.where = this.where == null ? null : this.where.clone();
 		namedTable.namedTableInterceptors = this.namedTableInterceptors;
+		namedTable.properties = this.properties;
 		return namedTable;
 	}