From d888528b8472fc67f966b48359879dcd6bcd01ff Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 17:48:30 +0900
Subject: [PATCH] - 업체메일 발송 시 파트너의 메일주소가 없을 경우 필터링 해주기 - 전체 프로젝트로 선택 되어있는 경우에도 이슈 만들때 이슈타입과 프로젝트가 선택되도록 수정
---
src/main/resources/mybatis/query-template/faq-template.xml | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/faq-template.xml b/src/main/resources/mybatis/query-template/faq-template.xml
index 3da048a..9305d29 100644
--- a/src/main/resources/mybatis/query-template/faq-template.xml
+++ b/src/main/resources/mybatis/query-template/faq-template.xml
@@ -18,7 +18,7 @@
<if test="title != '' and title != null">
AND n.title like CONCAT('%',#{title},'%')
</if>
- ORDER BY ID DESC
+ ORDER BY n.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
@@ -34,4 +34,37 @@
</if>
</select>
+ <select id="findNotActivation" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.FaqCondition">
+ SELECT
+ DISTINCT n.id as id,
+ n.title as title,
+ n.description as description,
+ n.register_id as registerId,
+ n.status as status,
+ u.name as writer,
+ SUBSTRING (n.register_date, 1, 10) as registerDate
+ FROM faq n
+ INNER JOIN user u on u.id = n.register_id
+ WHERE 1=1
+ AND n.status > 0
+ <if test="title != '' and title != null">
+ AND n.title like CONCAT('%',#{title},'%')
+ </if>
+ ORDER BY n.register_date DESC
+ <if test="page != null and !page.equals('')">
+ limit #{pageSize} offset #{page};
+ </if>
+ </select>
+
+ <select id="countNotActivation" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.FaqCondition">
+ SELECT
+ count(DISTINCT n.id)
+ FROM faq n
+ WHERE 1=1
+ AND n.status > 0
+ <if test="title != '' and title != null">
+ AND n.title like CONCAT('%',#{title},'%')
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0