From d123b961cf88627ae47c07ad2ffe7bf9532994ae Mon Sep 17 00:00:00 2001
From: lhc <taixingyiji@126.com>
Date: Mon, 22 Feb 2021 10:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E5=99=A8?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=ABbean=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AE=9E=E4=BD=93=E7=B1=BB=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8D=E6=B3=A8=E8=A7=A3=E5=BC=82=E5=B8=B8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/common/base/common/utils/ObjectUtil.java     | 4 ++++
 .../common/base/module/data/module/BaseMapperImpl.java    | 8 ++++----
 .../com/common/base/module/data/module/Condition.java     | 1 -
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/common/base/common/utils/ObjectUtil.java b/src/main/java/com/common/base/common/utils/ObjectUtil.java
index 4de1d44..202fde3 100644
--- a/src/main/java/com/common/base/common/utils/ObjectUtil.java
+++ b/src/main/java/com/common/base/common/utils/ObjectUtil.java
@@ -3,6 +3,7 @@ package com.common.base.common.utils;
 
 import com.common.base.common.ServiceException;
 import com.common.base.module.data.annotation.DataIgnore;
+import com.common.base.module.data.exception.BaseMapperException;
 import com.common.base.module.data.module.DataMap;
 import org.springframework.util.StringUtils;
 
@@ -76,6 +77,9 @@ public class ObjectUtil {
         List<String> fieldList = new ArrayList<>();
         if (clazz.getAnnotation(Table.class) != null) {
             Table table = clazz.getAnnotation(Table.class);
+            if (StringUtils.isEmpty(table.name())) {
+                throw new BaseMapperException("请检查实体类是否添加注解@Table,并且name中是否正确设置了表名");
+            }
             dataMap = dataMap.tableName(table.name());
         }
         for (Field field : clazz.getDeclaredFields()) {
diff --git a/src/main/java/com/common/base/module/data/module/BaseMapperImpl.java b/src/main/java/com/common/base/module/data/module/BaseMapperImpl.java
index c2508a2..9744051 100644
--- a/src/main/java/com/common/base/module/data/module/BaseMapperImpl.java
+++ b/src/main/java/com/common/base/module/data/module/BaseMapperImpl.java
@@ -19,12 +19,9 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 import java.util.Map;
 
-@Service
-@Qualifier("base")
+@Service("base")
 public class BaseMapperImpl implements BaseMapper {
 
-
-
     public static final String BASE = "base";
 
     final TableMapper tableMapper;
@@ -598,4 +595,7 @@ public class BaseMapperImpl implements BaseMapper {
         }
         return Long.parseLong(id.toString())+1L;
     }
+
+    public static void main(String[] args) {
+    }
 }
diff --git a/src/main/java/com/common/base/module/data/module/Condition.java b/src/main/java/com/common/base/module/data/module/Condition.java
index 162e0a0..965d7cf 100644
--- a/src/main/java/com/common/base/module/data/module/Condition.java
+++ b/src/main/java/com/common/base/module/data/module/Condition.java
@@ -5,7 +5,6 @@ import com.common.base.common.utils.XssClass;
 import com.common.base.common.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.io.Serializable;
 import java.util.List;