From add0cdefd56c50c5427945c895574f71202e7ed6 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 수, 16 3월 2022 18:12:51 +0900
Subject: [PATCH] - api로 이슈 추가 시 사용자정의필드 타입으로 체크 => 정규식표현검사로 체크로 변경
---
src/main/resources/mybatis/query-template/companyField-template.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..6e3eab6 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -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
@@ -122,13 +124,16 @@
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
<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}
+ AND (INET_ATON(cf.ip_start) BETWEEN #{ipStart} AND #{ipEnd} OR INET_ATON(cf.ip_end) BETWEEN #{ipStart} AND #{ipEnd}
+ OR #{ipStart} BETWEEN INET_ATON(cf.ip_start) AND INET_ATON(cf.ip_end) OR #{ipEnd} BETWEEN INET_ATON(cf.ip_start) AND INET_ATON(cf.ip_end))
</when>
</choose>
</select>
@@ -138,13 +143,16 @@
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
<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})
+ AND (INET_ATON(cf.ip_start) BETWEEN #{ipStart} AND #{ipEnd} OR INET_ATON(cf.ip_end) BETWEEN #{ipStart} AND #{ipEnd}
+ OR #{ipStart} BETWEEN INET_ATON(cf.ip_start) AND INET_ATON(cf.ip_end) OR #{ipEnd} BETWEEN INET_ATON(cf.ip_start) AND INET_ATON(cf.ip_end))
</when>
</choose>
<if test="id != '' and id != null">
--
Gitblit v1.8.0