From a60879f718fb4fee3bb2b8783a92570f8ead16c3 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 토, 11 12월 2021 21:34:07 +0900
Subject: [PATCH] 이메일 템플릿 수정[DB 초기화 필요]
---
src/main/resources/mybatis/query-template/issue-template.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index cc3103c..6916ce6 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -196,7 +196,9 @@
</foreach>
</when>
</choose>
- AND issue.parent_issue_id IS NULL
+ <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
+ AND issue.parent_issue_id IS NULL
+ </if>
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -252,7 +254,7 @@
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
temp_issue_comment on (temp_issue_comment.issue_id = issue.id)
WHERE 1=1
- <if test="keyWord != null and !keyWord.equals('') ">
+ <if test="keyWord != null and !keyWord.equals('') and myDepartmentIds.size != 0">
AND issue.title like CONCAT('%',#{keyWord},'%')
OR issue.description like CONCAT('%',#{keyWord},'%')
OR issue.start_date like CONCAT('%',#{keyWord},'%')
--
Gitblit v1.8.0