From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/resources/mybatis/query-template/companyField-template.xml | 41 ++++-------------------------------------
1 files changed, 4 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index a4a8708..9e13a19 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -47,7 +47,7 @@
</foreach>
</when>
</choose>
- <if test="ip != null and ip != ''">
+ <if test="ip != null and ip != '' and ip > -1">
AND INET_ATON(cf.ip_start) <![CDATA[ <= ]]> #{ip} AND INET_ATON(cf.ip_end) >= #{ip}
</if>
ORDER BY cf.register_date DESC
@@ -97,7 +97,9 @@
cf.id as id,
cf.name as name,
cf.email as email,
- cf.url as url
+ cf.url as url,
+ cf.ip_start AS ipStart,
+ cf.ip_end AS ipEnd
FROM
company_field cf
WHERE 1=1
@@ -110,41 +112,6 @@
<foreach collection="urls" item="item" index="index" separator="or" open="(" close=")">
cf.url LIKE CONCAT('%',#{item},'%')
</foreach>
- </when>
- </choose>
- <if test="id != '' and id != null">
- AND cf.id not like CONCAT('%',#{id},'%')
- </if>
- </select>
-
- <select id="findByIps" resultType="kr.wisestone.owl.domain.CompanyField" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition">
- SELECT
- cf.id as id,
- cf.name as name,
- cf.email as email,
- cf.url as url
- FROM
- company_field cf
- WHERE 1=1
- <choose>
- <when test="ipStart != null and ipStart != '' and ipEnd != null and ipEnd != ''">
- AND INET_ATON(cf.ip_start) BETWEEN #{ipStart} AND #{ipEnd} OR INET_ATON(cf.ip_end) BETWEEN #{ipStart} AND #{ipEnd}
- </when>
- </choose>
- </select>
-
- <select id="findByIpsAndIdNot" resultType="kr.wisestone.owl.domain.CompanyField" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition">
- SELECT
- cf.id as id,
- cf.name as name,
- cf.email as email,
- cf.url as url
- FROM
- company_field cf
- WHERE 1=1
- <choose>
- <when test="ipStart != null and ipStart != '' and ipEnd != null and ipEnd != ''">
- AND (INET_ATON(cf.ip_start) BETWEEN #{ipStart} AND #{ipEnd} OR INET_ATON(cf.ip_end) BETWEEN #{ipStart} AND #{ipEnd})
</when>
</choose>
<if test="id != '' and id != null">
--
Gitblit v1.8.0