From b2b8a75a8f5a35717bb89a07c2fe35ea16b6a99c Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 19 1월 2022 09:55:16 +0900 Subject: [PATCH] 이슈 히스토리 - 중복되어서 나오는 문제 해결 및 업체에 추가된 항목들도 변경 시 이력 남기도록 수정 --- src/main/resources/mybatis/query-template/companyField-template.xml | 15 ++++++++++++--- 1 files changed, 12 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..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,7 +29,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 +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