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/issue-template.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index b48ea17..a30841c 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -817,11 +817,13 @@
HAVING concatUseValue LIKE CONCAT('%', #{useValue}, '%')
</select>
- <!-- IP/SITE �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 �뾽泥댁� �룞�씪�븳 �씠�뒋瑜� 議고쉶 -->
- <select id="findByCustomFieldValueByCompany" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
+ <!-- �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠(SITE,IP) �뾽泥댁� �룞�씪�븳 �씠�뒋瑜� 議고쉶 -->
+ <select id="findByCustomFieldValueBySite" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
SELECT
issue.id as id,
issue.title as title,
+ issc.ip_start AS ipStart,
+ issc.ip_end AS ipEnd,
customFieldValue.customFieldType AS customFieldType,
GROUP_CONCAT(customFieldValue.useValue ORDER BY customFieldValue.customFieldId ASC) AS concatUseValue
FROM issue issue FORCE INDEX(reverseIndex)
@@ -833,11 +835,8 @@
) customFieldValue ON customFieldValue.issueId = issue.id
LEFT OUTER JOIN issue_company issc ON issc.issue_id = issue.id
WHERE issue.issue_type_id = #{issueTypeId}
- <if test="customFieldType != null and customFieldType.equals('SITE')">
+ <if test="useValue != null and useValue != ''">
AND issc.url LIKE CONCAT('%',#{useValue},'%')
- </if>
- <if test="customFieldType != null and customFieldType.equals('IP_ADDRESS')">
- AND INET_ATON(issc.ip_start) <![CDATA[ <= ]]> #{useValue} AND INET_ATON(issc.ip_end) >= #{useValue}
</if>
<choose>
<when test="issueStatusType != null">
--
Gitblit v1.8.0