From 091b698701b0f77c3746ac9cfe03e0c4d272cbfd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 24 12월 2021 18:14:58 +0900
Subject: [PATCH] 헤더에서 전체 프로젝트 선택 시 속해있지 않는 다른 프로젝트의 이슈유형리스트까지 보이는 문제 해결
---
src/main/resources/mybatis/query-template/widget-template.xml | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/widget-template.xml b/src/main/resources/mybatis/query-template/widget-template.xml
index 4b94ec0..6da8334 100644
--- a/src/main/resources/mybatis/query-template/widget-template.xml
+++ b/src/main/resources/mybatis/query-template/widget-template.xml
@@ -695,6 +695,7 @@
select
distinct i.id as id,
i.title as title,
+ i.issue_type_id as issueTypeId,
p.name as projectName,
CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
p.project_key as projectKey,
@@ -815,7 +816,8 @@
CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
i.issue_number as issueNumber,
p.project_key as projectKey,
- p.name as projectName
+ p.name as projectName,
+ i.issue_type_id as issueTypeId
from issue i
inner join issue_risk ir on ir.issue_id = i.id
inner join issue_status iss on iss.id = i.issue_status_id
@@ -874,6 +876,7 @@
, i.issue_number as issueNumber
, p.project_key as projectKey
, CONCAT(p.project_key, '-', i.issue_number) AS issueKey
+ , i.issue_type_id as issueTypeId
</if>
FROM issue i
<if test="page != null and !page.equals('')">
@@ -943,6 +946,7 @@
, iss.name as issueStatusName
, i.issue_number as issueNumber
, p.project_key as projectKey
+ , i.issue_type_id as issueTypeId
, CONCAT(p.project_key, '-', i.issue_number) AS issueKey
</if>
FROM issue i
@@ -1009,7 +1013,8 @@
</when>
</choose>
,p.id,
- p.name as projectName
+ p.name as projectName,
+ i.issue_type_id as issueTypeId
from issue i
inner join project p on p.id = i.project_id
inner join issue_status iss on iss.id = i.issue_status_id
@@ -1036,7 +1041,8 @@
</when>
</choose>
,p.id,
- p.name as projectName
+ p.name as projectName,
+ i.issue_type_id as issueTypeId
from issue i
inner join project p on p.id = i.project_id
inner join issue_status iss on iss.id = i.issue_status_id
@@ -1319,7 +1325,15 @@
parameterType="kr.wisestone.owl.web.condition.WidgetCondition">
SELECT issue_type.name as name, COUNT(issue.id) as issueCount FROM issue
INNER JOIN issue_type ON issue.issue_type_id = issue_type.id
- WHERE issue.project_id = #{projectId}
+ WHERE 1=1
+ <choose>
+ <when test="meAndDownProjectIds != null and meAndDownProjectIds.size != 0">
+ AND issue.project_id IN
+ <foreach collection="meAndDownProjectIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
GROUP BY issue_type.name
</select>
@@ -1421,7 +1435,8 @@
p.project_key AS projectKey,
p.name AS projectName,
iss.name AS issueStatusName,
- CONCAT(p.project_key, '-', i.issue_number) AS issueKey
+ CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
+ i.issue_type_id as issueTypeId
FROM issue i
INNER JOIN project p ON p.id = i.project_id
INNER JOIN workspace w ON w.id = p.workspace_id
@@ -1455,7 +1470,8 @@
p.project_key AS projectKey,
p.name AS projectName,
iss.name AS issueStatusName,
- CONCAT(p.project_key, '-', i.issue_number) AS issueKey
+ CONCAT(p.project_key, '-', i.issue_number) AS issueKey,
+ i.issue_type_id as issueTypeId
FROM issue i
INNER JOIN project p ON p.id = i.project_id
INNER JOIN workspace w ON w.id = p.workspace_id
--
Gitblit v1.8.0