From 22962f92e54deb421c99ec66f74d8deacb684606 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 23 Oct 2020 16:04:08 +0800
Subject: [PATCH] 修改

---
 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/service/impl/SuperServiceImpl.java                 |    5 +++--
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java |    3 ---
 pom.xml                                                                                                                                |    2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
index c8788d2..70cd685 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
@@ -130,9 +130,6 @@
     @JsonSerialize(
             using = ToStringSerializer.class
     )
-    @TableId(
-            type = IdType.ASSIGN_ID
-    )
     @DateTimeFormat(
             pattern = "yyyy-MM-dd HH:mm:ss"
     )
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/service/impl/SuperServiceImpl.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/service/impl/SuperServiceImpl.java
index 1bf6b9a..4283914 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/service/impl/SuperServiceImpl.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/service/impl/SuperServiceImpl.java
@@ -105,8 +105,9 @@
         if (null != entity) {
             Class<?> cls = entity.getClass();
             TableInfo tableInfo = TableInfoHelper.getTableInfo(cls);
-            if (null != tableInfo && StringUtils.isNotEmpty(tableInfo.getKeyProperty())) {
-                Object idVal = ReflectionKit.getMethodValue(cls, entity, tableInfo.getKeyProperty());
+            if (null != tableInfo && StringUtils.isNotBlank(tableInfo.getKeyProperty())) {
+//                Object idVal = ReflectionKit.getMethodValue(cls, entity, tableInfo.getKeyProperty());
+                Object idVal = ReflectionKit.getFieldValue(entity,tableInfo.getKeyProperty());
                 if (StringUtils.checkValNull(idVal) || Objects.isNull(getById((Serializable) idVal))) {
                     if (StrUtil.isEmpty(msg)) {
                         msg = "已存在";
diff --git a/pom.xml b/pom.xml
index e4e0d40..e62b831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <easypoi.version>4.1.0</easypoi.version>
         <poi.version>4.1.0</poi.version>
         <druid-starter>1.1.10</druid-starter>
-        <mybatis-plus-boot-starter.version>3.3.1</mybatis-plus-boot-starter.version>
+        <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
         <p6spy.version>3.8.6</p6spy.version>
         <swagger.version>2.9.2</swagger.version>
         <guava.version>28.1-jre</guava.version>

--
Gitblit v1.8.0