From 689e17c797bf3844f7b6b6f7c086df9bd8f72a0c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 19:45:34 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/mybatis/query-template/userWorkspace-template.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/userWorkspace-template.xml b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
index 402aff6..93d56a1 100644
--- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml
+++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
@@ -9,7 +9,8 @@
u.id as userId,
u.name as userName,
u.account as account,
- u.permission as permission,
+ u.level_id as levelId,
+ uw.manager_yn as managerYn,
CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
FROM
user_workspace uw
@@ -17,7 +18,6 @@
INNER JOIN workspace w on uw.workspace_id = w.id
WHERE 1=1
AND w.id = #{workspaceId}
- AND uw.manager_yn = 'N'
<if test="name != '' and name != null">
AND u.name like CONCAT('%',#{name},'%')
</if>
@@ -30,6 +30,15 @@
<when test="statuses.size != 0">
AND uw.use_yn IN
<foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+
+ <choose>
+ <when test="levelIds.size != 0">
+ AND u.level_id IN
+ <foreach collection="levelIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -49,7 +58,6 @@
INNER JOIN workspace w on uw.workspace_id = w.id
WHERE 1=1
AND w.id = #{workspaceId}
- AND uw.manager_yn = 'N'
<if test="name != '' and name != null">
AND u.name like CONCAT('%',#{name},'%')
</if>
--
Gitblit v1.8.0