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/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index e33066e..2fdf2dd 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -693,7 +693,25 @@
case "COMPANYFIELD_IP" :
if ($rootScope.isDefined(scope.data.ipStart) && $rootScope.isDefined(scope.data.ipEnd)) {
- makeTag += "<span>" + scope.data.ipStart + "<br>~<br>" + scope.data.ipEnd + "</span>";
+ let ipStartArr = [];
+ let ipEndArr = [];
+
+ if (scope.data.ipStart.indexOf(",") !== -1) {
+ scope.data.ipStart = scope.data.ipStart.split(",");
+ ipStartArr = angular.copy(scope.data.ipStart);
+ }
+ if (scope.data.ipEnd.indexOf(",") !== -1) {
+ scope.data.ipEnd = scope.data.ipEnd.split(",");
+ ipEndArr = angular.copy(scope.data.ipEnd);
+ }
+
+ if ($rootScope.isDefined(ipStartArr) && ipStartArr.toString() === scope.data.ipStart.toString()
+ && $rootScope.isDefined(ipEndArr) && ipEndArr.toString() === scope.data.ipEnd.toString()) {
+ scope.data.ipStart = scope.data.ipStart[0];
+ scope.data.ipEnd = scope.data.ipEnd[0];
+ }
+ makeTag += "<span>" + scope.data.ipStart + "<br>~</br>" + scope.data.ipEnd + "</span>";
+
}
break;
--
Gitblit v1.8.0