From ad486a401ad59d44bd4187f6406fe8c11b046a1f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 월, 21 2월 2022 16:05:09 +0900
Subject: [PATCH] - 파트너 정보 엑셀 임포트 시 연락처, 코드, 이메일 유효성 검사 - 특정 프로젝트로 설정된 상태에서 타 프로젝트의 이슈 클릭 시 대시보드로 이동되는 문제 해결
---
src/main/resources/mybatis/query-template/userWorkspace-template.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..93d56a1 100644
--- a/src/main/resources/mybatis/query-template/userWorkspace-template.xml
+++ b/src/main/resources/mybatis/query-template/userWorkspace-template.xml
@@ -9,9 +9,8 @@
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,
+ uw.manager_yn as managerYn,
CASE WHEN uw.use_yn = 'Y' THEN 'true' ELSE 'false' END as useYn
FROM
user_workspace uw
@@ -19,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>
@@ -32,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>
@@ -51,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