From f8d35ef0bfc812494f7d30dff1d075a3327209f1 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 18:30:04 +0900
Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정 폼에도 적용 - 입력 폼에서 탭키 안먹는 현상 수정

---
 src/main/resources/mybatis/query-template/companyField-template.xml |   10 +++++++---
 1 files changed, 7 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 53496ef..61f27e8 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -19,9 +19,13 @@
         cf.child_sector_id as childSectorId,
         cf.region_id as regionId,
         cf.status_id as statusId,
-        cf.status_name as statusName
+        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},'%')
@@ -32,7 +36,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>
@@ -40,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