From 171d9bc308a76fba7ddd78acd1871af3a2a107c7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 10 1월 2022 11:47:41 +0900
Subject: [PATCH] 이슈 수정 시 isp/호스팅 목록에 같은게 추가되는 현상 해결

---
 src/main/webapp/scripts/app/companyField/companyFieldList.controller.js |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 99d318e..3c387b3 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -17,8 +17,8 @@
                     makeTableConfigs : makeTableConfigs, //  �뀒�씠釉� �꽕�젙
                     initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
                     add : add, //�뾽泥� �깮�꽦
+                    makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶
                     removes : removes, //�뾽泥� �궘�젣
-                    makeSearchConditions : makeSearchConditions //�뿊�� �떎�슫濡쒕뱶
                 };
 
                 //  蹂��닔
@@ -54,6 +54,13 @@
                     $scope.fn.getPageList(0);
                 }
 
+                //  �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+                function makeSearchConditions() {
+                    return{
+                        name: $scope.vm.search.name
+                    };
+                }
+
                 //  �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 �뀒�씠釉� �꽕�젙
                 function makeTableConfigs() {
                     $scope.vm.tableConfigs = [];
@@ -85,7 +92,12 @@
                         .setDName("email")
                         .setDAlign("text-center"));
                     $scope.vm.tableConfigs.push($tableProvider.config()
-                        .setHName("companyField.desc")
+                        .setHName("companyField.url")
+                        .setHWidth("bold")
+                        .setDName("url")
+                        .setDAlign("text-center"));
+                    $scope.vm.tableConfigs.push($tableProvider.config()
+                        .setHName("companyField.memo")
                         .setHWidth("bold")
                         .setDName("memo")
                         .setDAlign("text-center"));
@@ -107,9 +119,8 @@
                         currentPage = selectedPage;
                     }
 
-                    var conditions = {
-                        name : $scope.vm.search.name //�뾽泥대챸
-                    };
+                    //  �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+                    var conditions = $scope.fn.makeSearchConditions();
 
                     //�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
                     CompanyField.find($resourceProvider.getContent(conditions,
@@ -117,8 +128,15 @@
 
                         if (result.data.message.status === "success") {
                             $scope.vm.page.selectedPage = currentPage + 1;
-                            $scope.vm.responseData = result.data;
+                            
+                            // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
+                            result.data.data.forEach(function (telData) {
+                                let hyphen = telData.tel.trim();
+                                let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+                                telData.tel = phone;
+                            });
 
+                            $scope.vm.responseData = result.data;
                         }
                         else {
                             SweetAlert.error($filter("translate")("companyField.failedToSelectCompanyFieldFullList"), result.data.message.message); // �뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣
@@ -217,13 +235,6 @@
                                 });
                             }
                         });
-                }
-
-                function makeSearchConditions() {
-                    var conditions = {
-                        name: $scope.vm.search.name
-                    }
-                    return conditions;
                 }
 
                 $scope.fn.makeTableConfigs();

--
Gitblit v1.8.0