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/companyField-template.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index e4b8e15..466d7e2 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -13,7 +13,13 @@
cf.url as url,
cf.memo as memo,
cf.isp_id as ispId,
- cf.hosting_id as hostingId
+ cf.hosting_id as hostingId,
+ cf.company_type_id as companyTypeId,
+ cf.parent_sector_id as parentSectorId,
+ cf.child_sector_id as childSectorId,
+ cf.region_id as regionId,
+ cf.status_id as statusId,
+ cf.status_name as statusName
FROM
company_field cf
WHERE 1=1
@@ -23,6 +29,10 @@
<if test="id != '' and id != null">
AND cf.id like CONCAT('%',#{id},'%')
</if>
+ <if test="url != '' and id != url">
+ AND cf.url like CONCAT('%',#{url},'%')
+ </if>
+ ORDER BY cf.register_date DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
@@ -30,7 +40,7 @@
<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition">
SELECT
- count(cf.id)
+ count(DISTINCT cf.id)
FROM
company_field cf
WHERE 1=1
--
Gitblit v1.8.0