From c4b2521c31fd618f66dde7a0d20f2cfc7c8a94bf Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 14:17:12 +0900
Subject: [PATCH] 하위/연관 이슈 업체만 있을 경우 나머지 항목 짤리는 문제 해결
---
src/main/webapp/views/issue/issueModify.html | 2 +-
src/main/webapp/custom_components/js-down/downColumnGenerator.directive.js | 6 +++---
src/main/webapp/custom_components/js-rel/relColumnGenerator.directive.js | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/custom_components/js-down/downColumnGenerator.directive.js b/src/main/webapp/custom_components/js-down/downColumnGenerator.directive.js
index 0984c32..d8aa278 100644
--- a/src/main/webapp/custom_components/js-down/downColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-down/downColumnGenerator.directive.js
@@ -127,7 +127,7 @@
// �뾽泥�
case "DOWN_USE_COMPANY" :
- if (scope.data.issueCompanyVos !== null && scope.data.issueCompanyVos[0] !== null) {
+ if (scope.data.issueCompanyVos !== null && scope.data.issueCompanyVos.length > 0 && scope.data.issueCompanyVos[0] !== null) {
makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.issueCompanyVos[0].name + "'></span>";
}else {
makeTag += "<span></span>";
@@ -136,7 +136,7 @@
// ISP
case "DOWN_USE_ISP" :
- if (scope.data.issueIspVos !== null && scope.data.issueIspVos[0] !== null) {
+ if (scope.data.issueIspVos !== null && scope.data.issueIspVos.length > 0 && scope.data.issueIspVos[0] !== null) {
makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.issueIspVos[0].name + "'></span>";
}else {
makeTag += "<span></span>";
@@ -145,7 +145,7 @@
// �샇�뒪�똿
case "DOWN_USE_HOSTING" :
- if (scope.data.issueHostingVos !== null && scope.data.issueHostingVos[0] !== null) {
+ if (scope.data.issueHostingVos !== null && scope.data.issueHostingVos.length > 0 && scope.data.issueHostingVos[0] !== null) {
makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.issueHostingVos[0].name + "'></span>";
}else {
makeTag += "<span></span>";
diff --git a/src/main/webapp/custom_components/js-rel/relColumnGenerator.directive.js b/src/main/webapp/custom_components/js-rel/relColumnGenerator.directive.js
index eb901f1..2588dc1 100644
--- a/src/main/webapp/custom_components/js-rel/relColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-rel/relColumnGenerator.directive.js
@@ -128,7 +128,7 @@
// �뾽泥�
case "REL_USE_COMPANY" :
- if (scope.data.issueCompanyVos !== null && scope.data.issueCompanyVos[0] !== null) {
+ if (scope.data.issueCompanyVos !== null && scope.data.issueCompanyVos.length > 0 && scope.data.issueCompanyVos[0] !== null) {
makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.issueCompanyVos[0].name + "'></span>";
}else {
makeTag += "<span></span>";
@@ -137,7 +137,7 @@
// ISP
case "REL_USE_ISP" :
- if (scope.data.issueIspVos !== null && scope.data.issueIspVos[0] !== null) {
+ if (scope.data.issueIspVos !== null && scope.data.issueIspVos.length > 0 && scope.data.issueIspVos[0] !== null) {
makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.issueIspVos[0].name + "'></span>";
}else {
makeTag += "<span></span>";
@@ -146,7 +146,7 @@
// �샇�뒪�똿
case "REL_USE_HOSTING" :
- if (scope.data.issueHostingVos !== null && scope.data.issueHostingVos[0] !== null) {
+ if (scope.data.issueHostingVos !== null && scope.data.issueHostingVos.length > 0 && scope.data.issueHostingVos[0] !== null) {
makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.issueHostingVos[0].name + "'></span>";
}else {
makeTag += "<span></span>";
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index e483193..1510436 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -428,7 +428,7 @@
custom-input="true"
source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page, fn.getIssueCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
- total-page="vm.autoCompletePage.companyField.totalPage"
+ total-page="vm.autoCompletePage.issueCompanyField.totalPage"
input-disabled="false"
translation-texts="{ empty : 'common.emptyCompany' }"
broad-cast="companyFieldEvent"
--
Gitblit v1.8.0