From 0eb0c43113ed9c4585ba936dcbe87feb4df6ba24 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 13 Aug 2020 20:00:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml
index eabadef..b9271bd 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml
@@ -42,6 +42,9 @@
             <if test="p.areaCh != null and p.areaCh !=''">
                 and area_ch = #{p.areaCh}
             </if>
+            <if test="p.enabled != null and p.enabled !=''">
+                and enabled = #{p.enabled}
+            </if>
         </where>
     </sql>
 
@@ -52,6 +55,7 @@
         from sys_area
         <include refid="where"/>
         order by id desc
+        limit 1
     </select>
 
     <!--定义根据-SysArea当作查询条件返回对象集合-->
@@ -60,6 +64,6 @@
         <include refid="Column_List"/>
         from sys_area
         <include refid="where"/>
-        order by id desc
+        order by id
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0