From 528658799b844839502e824bbf540c6827588427 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 20 Oct 2020 19:17:05 +0800
Subject: [PATCH] 增加到期套餐查询功能

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 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 df3f4fe..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
@@ -77,17 +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}
-    order by org_level
+         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