From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경

---
 src/main/resources/mybatis/query-template/companyField-template.xml |   12 +++++++++---
 1 files changed, 9 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 2393acf..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
@@ -26,7 +32,7 @@
         <if test="url != '' and id != url">
             AND cf.url like CONCAT('%',#{url},'%')
         </if>
-        ORDER BY cf.id DESC
+        ORDER BY cf.register_date DESC
         <if test="pageSize != '' and pageSize != null">
             limit #{pageSize} offset #{page};
         </if>
@@ -34,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