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 | 95 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 38 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 993f92c..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
@@ -12,47 +12,47 @@
<where>
<!--查询条件自行添加-->
is_del=0
- <if test="id != null and id !=''">
- and id = #{id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="orgLevel != null and orgLevel !=''">
- and org_level = #{orgLevel}
+ <if test="p.orgLevel != null and p.orgLevel !=''">
+ and org_level = #{p.orgLevel}
</if>
- <if test="orgAttr != null and orgAttr !=''">
- and org_attr = #{orgAttr}
+ <if test="p.orgAttr != null and p.orgAttr !=''">
+ and org_attr = #{p.orgAttr}
</if>
- <if test="orgParentId != null and orgParentId !=''">
- and org_parent_id = #{orgParentId}
+ <if test="p.orgParentId != null and p.orgParentId !=''">
+ and org_parent_id = #{p.orgParentId}
</if>
- <if test="orgName != null and orgName !=''">
- and org_name = #{orgName}
+ <if test="p.orgName != null and p.orgName !=''">
+ and org_name like '%${p.orgName}%'
</if>
- <if test="orgOrder != null and orgOrder !=''">
- and org_order = #{orgOrder}
+ <if test="p.orgOrder != null and p.orgOrder !=''">
+ and org_order = #{p.orgOrder}
</if>
- <if test="isDel != null and isDel !=''">
- and is_del = #{isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="enabled != null and enabled !=''">
- and enabled = #{enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="createUserId != null and createUserId !=''">
- and create_user_id = #{createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="createUserName != null and createUserName !=''">
- and create_user_name = #{createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="updateUserId != null and updateUserId !=''">
- and update_user_id = #{updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="updateUserName != null and updateUserName !=''">
- and update_user_name = #{updateUserName}
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
</if>
- <if test="createTime != null and createTime !=''">
- and create_time = #{createTime}
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
</where>
</sql>
@@ -63,6 +63,8 @@
<include refid="Column_List"/>
from sys_organization
<include refid="where"/>
+ order by id desc
+ limit 1
</select>
<!--定义根据-SysOrganization当作查询条件返回对象集合-->
@@ -75,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