From 43a910170d8049ef99ba38cc2a81b99cad89fb0d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 15:59:17 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mybatis/query-template/userWorkspace-template.xml |   13 ++++++++++---
 1 files changed, 10 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 cde0860..e62cbbc 100644
--- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml
+++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
@@ -9,9 +9,7 @@
         u.id as userId,
         u.name as userName,
         u.account as account,
-        u.levelName as levelName,
-        u.departmentName as departmentName,
-        /*u.permission as permission,*/
+        u.level_id as levelId,
         CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
         FROM
         user_workspace uw
@@ -36,6 +34,15 @@
                 </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>
+        </choose>
         limit #{pageSize} offset #{page};
     </select>
 

--
Gitblit v1.8.0