From 398a4927e195755bd6a46be99337efd8dacc3dc2 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:08:13 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/resources/mybatis/query-template/issue-template.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index d529c00..8392915 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -139,7 +139,7 @@
</if>
<if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
- <if test="hideDownIssue != null and hideDownIssue == true">
+ <if test="hideDownIssue != null and hideDownIssue == true and parentYN == true">
AND issue.parent_issue_id IS NULL
</if>
</if>
@@ -148,8 +148,12 @@
AND issue_status.issue_status_type != 'CLOSE'
</if>
- <if test="parentYN != null and parentYN == true">
+ <if test="parentYN != null and parentYN == true and hideDownIssue == true">
AND issue.parent_issue_id IS NULL
+ </if>
+
+ <if test="hideDownIssue == false and parentYN == false">
+ AND issue.parent_issue_id IS NOT NULL
</if>
<choose>
@@ -360,11 +364,15 @@
</if>
<if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
- <if test="hideDownIssue != null and hideDownIssue == true">
+ <if test="hideDownIssue != null and hideDownIssue == true and parentYN == true">
AND issue.parent_issue_id IS NULL
</if>
</if>
+ <if test="hideDownIssue == false and parentYN == false">
+ AND issue.parent_issue_id IS NOT NULL
+ </if>
+
<if test="hideCompleteIssue != null and hideCompleteIssue == true">
AND issue_status.issue_status_type != 'CLOSE'
</if>
--
Gitblit v1.8.0