From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 17:25:23 +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 | 26 ++++++++++++++------------
1 files changed, 14 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..18c73ac 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -5,19 +5,21 @@
<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
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="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
@@ -26,15 +28,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