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/SysOrganizationMapper.xml | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml
index 4be2b96..749a853 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml
@@ -25,7 +25,7 @@
and org_parent_id = #{p.orgParentId}
</if>
<if test="p.orgName != null and p.orgName !=''">
- and org_name = #{p.orgName}
+ and org_name like '%${p.orgName}%'
</if>
<if test="p.orgOrder != null and p.orgOrder !=''">
and org_order = #{p.orgOrder}
@@ -58,16 +58,17 @@
</sql>
<!--定义根据-SysOrganization当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysOrganization">
+ <select id="findByObject" resultType="com.kidgrow.common.model.SysOrganization">
select
<include refid="Column_List"/>
from sys_organization
<include refid="where"/>
order by id desc
+ limit 1
</select>
<!--定义根据-SysOrganization当作查询条件返回对象集合-->
- <select id="findList" resultType="com.kidgrow.usercenter.model.SysOrganization">
+ <select id="findList" resultType="com.kidgrow.common.model.SysOrganization">
select
<include refid="Column_List"/>
from sys_organization
@@ -76,16 +77,33 @@
</select>
<!--根据用户ID查询用户所属组织机构列表-->
+<!-- <select id="findListByUserId" resultType="com.kidgrow.common.model.SysOrganization">-->
+<!-- SELECT-->
+<!-- org.id,-->
+<!-- org.org_parent_id,-->
+<!-- org.org_name ,-->
+<!-- org.org_attr,-->
+<!-- org.org_level-->
+<!-- FROM sys_user_org uo-->
+<!-- LEFT JOIN sys_organization org ON uo.org_id = org.id-->
+<!-- AND (uo.enabled = TRUE AND uo.is_del = FALSE) AND (org.is_del = FALSE AND org.enabled = TRUE)-->
+<!-- where uo.user_id=#{userId}-->
+<!-- order by org_level-->
+<!-- </select>-->
<select id="findListByUserId" resultType="com.kidgrow.common.model.SysOrganization">
- SELECT
- org.id,
- org.org_parent_id,
- org.org_name ,
- org.org_attr,
- org.org_level
- FROM sys_user_org uo
- LEFT JOIN sys_organization org ON uo.org_id = org.id
- AND (uo.enabled = TRUE AND uo.is_del = FALSE) AND (org.is_del = FALSE AND org.enabled = TRUE)
- where uo.user_id=#{userId}
+ SELECT
+ org.*
+ FROM
+ sys_user_org uo
+ LEFT JOIN sys_organization org ON uo.org_id = org.id
+ WHERE
+ org.is_del = FALSE
+ AND org.enabled = TRUE
+ AND uo.enabled = TRUE
+ AND uo.is_del = FALSE
+ and uo.user_id=#{userId}
+ ORDER BY
+ org_level
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0