From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정

---
 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