From bdc56ebc9534620766d787a1dacb4c962ea10797 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 10:36:35 +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/SysDictionariesMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml
index f9c5492..b8f51c3 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml
@@ -16,10 +16,13 @@
and id = #{p.id}
</if>
<if test="p.dictionariesName != null and p.dictionariesName !=''">
- and dictionaries_name = #{p.dictionariesName}
+ and dictionaries_name like '%${p.dictionariesName}%'
</if>
<if test="p.dictionariesClassId != null and p.dictionariesClassId !=''">
and dictionaries_class_id = #{p.dictionariesClassId}
+ </if>
+ <if test="p.dictionariesClassIdIsNull != null and p.dictionariesClassIdIsNull !=''">
+ and dictionaries_class_id is null
</if>
<if test="p.dictionariesOrder != null and p.dictionariesOrder !=''">
and dictionaries_order = #{p.dictionariesOrder}
@@ -67,6 +70,13 @@
<include refid="Column_List"/>
from sys_dictionaries
<include refid="where"/>
- order by id desc
+ order by id asc
+ </select>
+ <select id="findAll" resultType="com.kidgrow.usercenter.model.SysDictionaries">
+ select
+ <include refid="Column_List"/>
+ from sys_dictionaries
+ <include refid="where"/>
+ order by id asc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0