From b2b9e785e10c8fd59c3fcee8c8fda2aeb86be8c3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 13:34:22 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/mybatis/query-template/companyField-template.xml | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index 4dd9d58..2393acf 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -5,20 +5,28 @@
<select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition">
SELECT
- c.id as id,
- c.name as name,
- c.tel as tel,
- c.email as email,
- c.memo as memo
+ cf.id as id,
+ cf.name as name,
+ cf.manager as manager,
+ cf.tel as tel,
+ cf.email as email,
+ cf.url as url,
+ cf.memo as memo,
+ cf.isp_id as ispId,
+ cf.hosting_id as hostingId
FROM
- company c
+ company_field cf
WHERE 1=1
<if test="name != '' and name != null">
- AND c.name like CONCAT('%',#{name},'%')
+ AND cf.name like CONCAT('%',#{name},'%')
</if>
<if test="id != '' and id != null">
- AND c.id like CONCAT('%',#{id},'%')
+ AND cf.id like CONCAT('%',#{id},'%')
</if>
+ <if test="url != '' and id != url">
+ AND cf.url like CONCAT('%',#{url},'%')
+ </if>
+ ORDER BY cf.id DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
@@ -26,15 +34,15 @@
<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition">
SELECT
- count(c.id)
+ count(cf.id)
FROM
- company c
+ company_field cf
WHERE 1=1
<if test="name != '' and name != null">
- AND c.name like CONCAT('%',#{name},'%')
+ AND cf.name like CONCAT('%',#{name},'%')
</if>
<if test="id != '' and id != null">
- AND c.id like CONCAT('%',#{id},'%')
+ AND cf.id like CONCAT('%',#{id},'%')
</if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0