From 12e19e0b8bc5e728169dad54c132e7ccd41973a4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 14 3월 2022 12:55:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index f928c4b..6d8152f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -528,6 +528,7 @@
}
if(customFieldApiOverlap.getCustomField().getCustomFieldType().equals(SITE)) {
+ customFieldType = SITE.toString();
String[] urlArr = null;
List<String> urls = Lists.newArrayList();
if (useValue.contains(",")) {
@@ -576,8 +577,11 @@
ipValue = ConvertUtil.ipToLong(concatUseValue);
}
issueCustomFieldValueCondition.setUseValue(String.valueOf(ipValue));
- // �븯�쐞�씠�뒋議곌굔�쓽 ���엯�씠 IP�씪 寃쎌슦 媛숈� �뾽泥댁젙蹂댁씤 �씠�뒋 李얘린
- results = this.issueMapper.findByCustomFieldValueOfIp(issueCustomFieldValueCondition);
+ }
+
+ if (issueCustomFieldValueCondition.getCustomFieldType() != null && !issueCustomFieldValueCondition.getCustomFieldType().equals("")) {
+ // �궗�슜�옄�젙�쓽�븘�뱶 ���엯�씠 IP_ADDRESS �삉�뒗 SITE �씪 寃쎌슦
+ results = this.issueMapper.findByCustomFieldValueByCompany(issueCustomFieldValueCondition);
} else {
results = this.issueMapper.findByCustomFieldValue(issueCustomFieldValueCondition);
}
--
Gitblit v1.8.0