From fc223b26f87f7a221b38084bb62d8047974bbf1c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 12:42:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
index 1bc902e..4a1c70c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
@@ -11,12 +11,12 @@
     <sql id="where">
         <where>
             <!--查询条件自行添加-->
-            p.is_del=0
+            is_del=0
             <if test="p.id != null and p.id !=''">
                 and id = #{p.id}
             </if>
             <if test="p.proName != null and p.proName !=''">
-                and pro_name = #{p.proName}
+                and pro_name like concat('%', #{p.proName}, '%')
             </if>
             <if test="p.proTime != null and p.proTime !=''">
                 and pro_time = #{p.proTime}
@@ -57,6 +57,7 @@
             <if test="p.updateTime != null and p.updateTime !=''">
                 and update_time = #{p.updateTime}
             </if>
+            <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>
         </where>
     </sql>
 
@@ -67,6 +68,7 @@
         from sys_product
         <include refid="where"/>
         order by id desc
+        limit 1
     </select>
 
     <!--定义根据-SysProduct当作查询条件返回对象集合-->

--
Gitblit v1.8.0