From 1bf54ac4463cc9a821bb818f6c8cfb01d981e91a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 23 12월 2021 15:51:29 +0900
Subject: [PATCH] - '이슈관리' 권한은 내가 속해있는 프로젝트의 이슈에 대해서만 관리 권한이 있음 - 일반 사용자 검색 문제 해결 - 이슈리스트 툴팁 재추가
---
src/main/resources/mybatis/query-template/project-template.xml | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 106 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/project-template.xml b/src/main/resources/mybatis/query-template/project-template.xml
index e2d6b13..af293cd 100644
--- a/src/main/resources/mybatis/query-template/project-template.xml
+++ b/src/main/resources/mybatis/query-template/project-template.xml
@@ -82,12 +82,15 @@
AND p.name like CONCAT('%',#{name},'%')
</if>
<choose>
- <when test="myDepartmentIds.size != 0">
+ <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
AND prd.department_id IN
<foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
+ <otherwise>
+ AND 1 != 1
+ </otherwise>
</choose>
<choose>
@@ -184,12 +187,15 @@
</if>
<choose>
- <when test="myDepartmentIds.size != 0">
+ <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
AND prd.department_id IN
<foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
+ <otherwise>
+ AND 1 != 1
+ </otherwise>
</choose>
<choose>
@@ -334,9 +340,45 @@
AND p.workspace_id = #{workspaceId}
</select>
+ <!-- �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 吏꾪뻾以묒씤 紐⑤뱺 �봽濡쒖젥�듃瑜� 議고쉶�븳�떎 -->
+ <select id="findByWorkspaceIdAndProjectAll" resultType="java.util.HashMap"
+ parameterType="kr.wisestone.owl.web.condition.ProjectCondition">
+ SELECT
+ DISTINCT p.id as id,
+ p.name as name,
+ p.description as description,
+ p.status as status,
+ p.start_date as startDate,
+ p.end_date as endDate,
+ p.project_key as projectKey,
+ CASE p.default_yn WHEN 'Y' THEN 'true' ELSE 'false' END as defaultYn
+ FROM
+ project p
+ INNER JOIN project_role pr on p.id = pr.project_id
+ INNER JOIN project_role_user pru on pru.project_role_id = pr.id
+ WHERE p.workspace_id = #{workspaceId}
+ <if test="name != '' and name != null">
+ AND p.name like CONCAT('%',#{name},'%')
+ </if>
+ <choose>
+ <when test="statuses.size != 0">
+ AND p.status IN
+ <foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ <choose>
+ <when test="excludeIds.size != 0">
+ AND p.id NOT IN
+ <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ </select>
- <!-- �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 吏꾪뻾以묒씤 �봽濡쒖젥�듃瑜� 議고쉶�븳�떎 -->
- <select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
+ <!-- <select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
parameterType="kr.wisestone.owl.web.condition.ProjectCondition">
SELECT
DISTINCT p.id as id,
@@ -353,6 +395,55 @@
INNER JOIN project_role_user pru on pru.project_role_id = pr.id
WHERE pru.user_id = #{loginUserId}
AND p.workspace_id = #{workspaceId}
+ <if test="name != '' and name != null">
+ AND p.name like CONCAT('%',#{name},'%')
+ </if>
+ <choose>
+ <when test="statuses.size != 0">
+ AND p.status IN
+ <foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ <choose>
+ <when test="excludeIds.size != 0">
+ AND p.id NOT IN
+ <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ </select>-->
+
+ <!-- �빐�떦 �뾽臾� 怨듦컙�뿉�꽌 李몄뿬�븯怨� �엳�뒗 吏꾪뻾以묒씤 �봽濡쒖젥�듃瑜� 議고쉶�븳�떎 -->
+ <select id="findByWorkspaceIdAndIncludeProjectAll" resultType="java.util.HashMap"
+ parameterType="kr.wisestone.owl.web.condition.ProjectCondition">
+ SELECT
+ DISTINCT p.id as id,
+ p.name as name,
+ p.description as description,
+ p.status as status,
+ p.start_date as startDate,
+ p.end_date as endDate,
+ p.project_key as projectKey,
+ CASE p.default_yn WHEN 'Y' THEN 'true' ELSE 'false' END as defaultYn
+ FROM
+ project p
+ INNER JOIN project_role pr on p.id = pr.project_id
+ LEFT OUTER JOIN project_role_user pru on pru.project_role_id = pr.id
+ LEFT OUTER JOIN project_role_department prd ON prd.project_role_id = pr.id
+ LEFT OUTER JOIN department d on d.id = prd.department_id
+ WHERE p.workspace_id = #{workspaceId}
+ AND pru.user_id = #{loginUserId}
+ <choose>
+ <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
+ OR prd.department_id IN
+ <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
<if test="name != '' and name != null">
AND p.name like CONCAT('%',#{name},'%')
</if>
@@ -480,6 +571,17 @@
AND p.name like CONCAT('%',#{name},'%')
</if>
<choose>
+ <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
+ AND prd.department_id IN
+ <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ <otherwise>
+ AND 1 != 1
+ </otherwise>
+ </choose>
+ <choose>
<when test="statuses.size != 0">
AND p.status IN
<foreach collection="statuses" item="item" index="index" separator="," open="(" close=")">
--
Gitblit v1.8.0