From f8d35ef0bfc812494f7d30dff1d075a3327209f1 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 18:30:04 +0900
Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정 폼에도 적용 - 입력 폼에서 탭키 안먹는 현상 수정

---
 src/main/resources/mybatis/query-template/userWorkspace-template.xml |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/mybatis/query-template/userWorkspace-template.xml b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
index ffaeea5..93d56a1 100644
--- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml
+++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
@@ -10,7 +10,7 @@
         u.name as userName,
         u.account as account,
         u.level_id as levelId,
-        u.department_id as departmentId,
+        uw.manager_yn as managerYn,
         CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
         FROM
         user_workspace uw
@@ -18,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>
@@ -44,16 +43,6 @@
                 </foreach>
             </when>
         </choose>
-
-        <choose>
-            <when test="departmentIds.size != 0">
-                AND u.department_id IN
-                <foreach collection="departmentIds" item="item" index="index" separator="," open="(" close=")">
-                    #{item}
-                </foreach>
-            </when>
-        </choose>
-
         limit #{pageSize} offset #{page};
     </select>
 
@@ -69,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