From 56ae1cd12a7a3a92563bcbf5583f659c5ad5eee5 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 15:42:59 +0900
Subject: [PATCH] - 상위 이슈 검색시 하위 이슈는 검색 제외 및 프로젝트 설정 해야 상위이슈 선택 가능하도록 수정

---
 src/main/resources/mybatis/query-template/companyField-template.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index 0ee3d09..61f27e8 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -13,9 +13,19 @@
         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,
+        sf.name AS ispName,
+        hf.name AS hostingName
         FROM
         company_field cf
+        LEFT OUTER JOIN isp_field sf ON cf.isp_id = sf.id
+        LEFT OUTER JOIN hosting_field hf ON cf.hosting_id = hf.id
         WHERE 1=1
         <if test="name != '' and name != null">
             AND cf.name like CONCAT('%',#{name},'%')
@@ -23,7 +33,10 @@
         <if test="id != '' and id != null">
             AND cf.id like CONCAT('%',#{id},'%')
         </if>
-        ORDER BY cf.id DESC
+        <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>
@@ -31,7 +44,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