From ce82939b2d2ef793e446f464314c6e570c7ebad5 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 05 1월 2022 10:48:42 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mybatis/query-template/userWorkspace-template.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/userWorkspace-template.xml b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
index e62cbbc..93d56a1 100644
--- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml
+++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
@@ -10,6 +10,7 @@
u.name as userName,
u.account as account,
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>
@@ -58,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