From 16adee1c52851b0fdb6828330a1ef75d9fdf6ada Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Tue, 12 May 2020 10:59:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/form/impl/DynamicConfigFormServiceImpl.java      | 2 +-
 .../dynamic/config/impl/DynamicConfigTableServiceImpl.java  | 2 +-
 .../templates/codetemplate/default/service/ServiceImpl.ftl  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/impl/DynamicConfigFormServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/impl/DynamicConfigFormServiceImpl.java
index 4732813..569701f 100644
--- a/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/impl/DynamicConfigFormServiceImpl.java
+++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/form/impl/DynamicConfigFormServiceImpl.java
@@ -103,6 +103,6 @@ public class DynamicConfigFormServiceImpl extends AbstractService implements IDy
         PageHelper.startPage(page.getPage(), page.getRows());
         List<DynamicConfigFormDTO> dynamicConfigFormDTOList = dynamicConfigFormDao.listForm(page.getParams());
         PageInfo<DynamicConfigFormDTO> pageInfo = new PageInfo<>(dynamicConfigFormDTOList);
-        return new SuccessResultList<>(dynamicConfigFormDTOList, pageInfo.getPageNum(), page.getTotal());
+        return new SuccessResultList<>(dynamicConfigFormDTOList, pageInfo.getPageNum(), pageInfo.getTotal());
     }
 }
diff --git a/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/impl/DynamicConfigTableServiceImpl.java b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/impl/DynamicConfigTableServiceImpl.java
index a4017b6..706a18f 100644
--- a/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/impl/DynamicConfigTableServiceImpl.java
+++ b/cloud-common-plugin-dynamic/src/main/java/com/cm/common/plugin/service/dynamic/config/impl/DynamicConfigTableServiceImpl.java
@@ -156,7 +156,7 @@ public class DynamicConfigTableServiceImpl extends AbstractService implements ID
         PageHelper.startPage(page.getPage(), page.getRows());
         List<DynamicConfigTableDTO> dynamicConfigTableDTOList = dynamicConfigTableDao.listTable(page.getParams());
         PageInfo<DynamicConfigTableDTO> pageInfo = new PageInfo<>(dynamicConfigTableDTOList);
-        return new SuccessResultList<>(dynamicConfigTableDTOList, pageInfo.getPageNum(), page.getTotal());
+        return new SuccessResultList<>(dynamicConfigTableDTOList, pageInfo.getPageNum(), pageInfo.getTotal());
     }
 
     @Override
diff --git a/cloud-common-plugin-dynamic/src/main/resources/templates/codetemplate/default/service/ServiceImpl.ftl b/cloud-common-plugin-dynamic/src/main/resources/templates/codetemplate/default/service/ServiceImpl.ftl
index 73bb3b4..929ea08 100644
--- a/cloud-common-plugin-dynamic/src/main/resources/templates/codetemplate/default/service/ServiceImpl.ftl
+++ b/cloud-common-plugin-dynamic/src/main/resources/templates/codetemplate/default/service/ServiceImpl.ftl
@@ -47,12 +47,12 @@ public class ${firstUpperTableName}ServiceImpl extends BaseService implements I$
     }
 
     @Override
-    public String save${firstUpperTableName}(${firstUpperTableName}VO ${firstLowerTableName}VO) throws Exception {
+    public String save${firstUpperTableName}ReturnId(${firstUpperTableName}VO ${firstLowerTableName}VO) throws Exception {
         return save${firstUpperTableName}InfoReturnId(null, ${firstLowerTableName}VO);
     }
 
     @Override
-    public String save${firstUpperTableName}ByToken(String token, ${firstUpperTableName}VO ${firstLowerTableName}VO) throws Exception {
+    public String save${firstUpperTableName}ByTokenReturnId(String token, ${firstUpperTableName}VO ${firstLowerTableName}VO) throws Exception {
         return save${firstUpperTableName}InfoReturnId(token, ${firstLowerTableName}VO);
     }
 
@@ -64,7 +64,7 @@ public class ${firstUpperTableName}ServiceImpl extends BaseService implements I$
      * @throws Exception
      */
     private void save${firstUpperTableName}Info(String token, ${firstUpperTableName}VO ${firstLowerTableName}VO) throws Exception {
-        save${firstUpperTableName}InfoReturnId(token, ${firstUpperTableName}VO ${firstLowerTableName}VO);
+        save${firstUpperTableName}InfoReturnId(token, ${firstLowerTableName}VO);
     }
 
     /**