From 5aeb1fd2d825392fb0b2ac00e6edf16a2cdbc5b7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 13 12월 2021 14:53:07 +0900
Subject: [PATCH] 이슈 검색시 하위 이슈도 검색되는 오류수정
---
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 9 +++++++++
src/main/resources/mybatis/query-template/issue-template.xml | 10 ++++++++++
src/main/webapp/scripts/app/issue/issueList.controller.js | 8 ++++++++
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index 264c5d3..aa34bb3 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -56,6 +56,7 @@
private String modifyByName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
private WorkflowStatusVo workflowStatusVo;
private IssueVo parentIssueVo;
+ private Long parentIssueId;
private int downIssueCount;
private int downIssueAllCount;
private List<Long> workflowDepartmentIds; // �썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 ID
@@ -521,4 +522,12 @@
this.issueTableConfigVos.add(issueTableConfigVo);
}
}
+
+ public Long getParentIssueId() {
+ return parentIssueId;
+ }
+
+ public void setParentIssueId(Long parentIssueId) {
+ this.parentIssueId = parentIssueId;
+ }
}
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 5c3a3c7..d4dea19 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -552,6 +552,7 @@
FROM issue issue
LEFT OUTER JOIN issue_department isd ON issue.id = isd.issue_id
LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
+ LEFT OUTER JOIN user_department ud ON ud.department_id = isd.department_id
WHERE 1=1
AND issue.parent_issue_id IS NULL
<if test="title != null and !title.equals('') ">
@@ -649,6 +650,15 @@
</choose>
<choose>
+ <when test="departmentIds.size != 0 and myDepartmentIds != null and myDepartmentIds.size != 0">
+ AND isd.department_id IN
+ <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+
+ <choose>
<when test="registerIds.size != 0">
AND issue.register_id IN
<foreach collection="registerIds" item="item" index="index" separator="," open="(" close=")">
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index ed3d50f..ca0df09 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -624,6 +624,14 @@
if (result.data.message.status === "success") {
if (result.data.data != null && result.data.data.length > 0) {
+ for (var i = 0; i < result.data.data.length; i++) {
+ if (result.data.data[i].parentIssueId != null) {
+ result.data.data.splice(i, 1);
+ }
+ }
+ }
+
+ if (result.data.data != null && result.data.data.length > 0) {
$scope.vm.issueTypeId = result.data.data[0].issueTypeId;
$scope.vm.projectKey = result.data.data[0].projectKey;
$scope.vm.issueNumber = result.data.data[0].issueNumber;
--
Gitblit v1.8.0