From cfd5de3e8d21b3252583c3d16fee3789091e4db1 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 16 Aug 2022 15:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/java/service.java.vm   |  2 +-
 .../main/resources/java/serviceImpl.java.vm   | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm
index eb8e39af..50493c4a 100644
--- a/server/like-generator/src/main/resources/java/service.java.vm
+++ b/server/like-generator/src/main/resources/java/service.java.vm
@@ -13,7 +13,7 @@ import java.util.Map;
  */
 public interface I${EntityName}Service {
 
- #if($table.genTpl=="curd")
+ #if($table.genTpl=="crud")
     /**
      * ${functionName}列表
      *
diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
index d083837c..0dfde6db 100644
--- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm
+++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
@@ -28,7 +28,7 @@ import java.util.*;
 @Service
 public class ${EntityName}ServiceImpl implements I${EntityName}Service {
     ## 设置模板方式的变量
-    #if($table.genTpl.equals("curd"))
+    #if($table.genTpl.equals("crud"))
         #set($genTpl = "PageResult<${EntityName}ListVo>")
         #if($isSearch)
             #set($isSearchParam = true)
@@ -69,7 +69,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
      */
     @Override
     public $genTpl list($genParam) {
-    #if($table.genTpl.equals("curd"))
+    #if($table.genTpl.equals("crud"))
         Integer page  = pageParam.getPageNo();
         Integer limit = pageParam.getPageSize();
     #end
@@ -131,9 +131,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
 
     #if(!$table.subTableName.equals("") && !$table.subTableFk.equals(""))
         #set($isJoin = true)
-        #set($joinCurdList = "${EntityName}ListVo")
-        #set($joinCurdName = "iPage.getRecords()")
-        #if($table.genTpl.equals("curd"))
+        #set($joinCrudList = "${EntityName}ListVo")
+        #set($joinCrudName = "iPage.getRecords()")
+        #if($table.genTpl.equals("crud"))
         IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage(
                 new Page<>(page, limit),
                 ${EntityName}ListVo.class,
@@ -145,12 +145,12 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         #end
     #else
         #set($isJoin = false)
-        #set($joinCurdList = "${EntityName}")
-        #if($table.genTpl.equals("curd"))
-        #set($joinCurdName = "iPage.getRecords()")
+        #set($joinCrudList = "${EntityName}")
+        #if($table.genTpl.equals("crud"))
+        #set($joinCrudName = "iPage.getRecords()")
         IPage<${EntityName}> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), $queryWrapper);
         #else
-        #set($joinCurdName = "array")
+        #set($joinCrudName = "array")
         List<${EntityName}> array = ${entityName}Mapper.selectList($queryWrapper);
         #end
     #end
@@ -165,7 +165,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         #if(!$isJoin)
         List<${EntityName}ListVo> list = new LinkedList<>();
         #end
-        for($joinCurdList item : $joinCurdName) {
+        for($joinCrudList item : $joinCrudName) {
         #if(!$isJoin)
             ${EntityName}ListVo vo = new ${EntityName}ListVo();
             BeanUtils.copyProperties(item, vo);
@@ -229,7 +229,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         }
     #end
 
-    #if($table.genTpl.equals("curd"))
+    #if($table.genTpl.equals("crud"))
         #if($isJoin)
         return PageResult.iPageHandle(iPage);
         #else