From daa697719eb0ddfd170f1ab94c5422a4f5b93951 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 18 Sep 2020 14:36:54 +0800
Subject: [PATCH] Merge branch 'dev'

---
 kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm
index 8c652d5..3569505 100644
--- a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm
+++ b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Mapper.xml.vm
@@ -14,8 +14,8 @@
             is_del=0
             #foreach($column in $columns)
             #if($column.columnName != $pk.columnName || $pk.extra != 'auto_increment')
-            <if test="$column.attrname != null and $column.attrname !=''">
-                and  $column.columnName =  #{$column.attrname}
+            <if test="p.$column.attrname != null and p.$column.attrname !=''">
+                and  $column.columnName =  #{p.$column.attrname}
             </if>
             #end
             #end
@@ -28,12 +28,14 @@
         from ${tableName}
         <include refid="where"/>
         order by id desc
+        limit 1
     </select>
 
     <!--定义根据-${className}当作查询条件返回对象集合-->
     <select id="findList" resultType="${package}.${moduleName}.model.${className}">
         select <include refid="Column_List"/>
         from ${tableName}
+        <include refid="where"/>
         order by id desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0