From 1b960584383766692a257a4cdd92daf19bab172d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 27 12월 2021 09:32:50 +0900
Subject: [PATCH] - API 추가/수정시 사용자 정의 필드 항목이 없을 경우 오류 처리 - API 에서 도메인만 추출하여 같은 도메인을 갖는 업체/isp/hosting 자동 입력하도록 수정

---
 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 0b89246..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