From c8d436c6d85ea6f1e93c838a8b5a4690d0f075e4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 10:43:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 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 49b8c58..068d62f 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -135,12 +135,15 @@
                                         case "USE_DEPARTMENT_LIST" :
                                             makeTag += "<ul class='ul-not-comma'>";
 
-                                            makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id)'>";
-                                            angular.forEach(scope.data.departments, function (department) { //departmentVO濡� �닔�젙 泥댄겕 �븘�슂
-                                                makeTag += "<li>" + department.fieldValue + "</li>";
-                                            });
-                                            makeTag += "</div>";
-
+                                            if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
+                                                makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
+                                            }else{
+                                                makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
+                                                angular.forEach(scope.data.departmentVos, function (departments) {
+                                                    makeTag += "<li>" + departments.departmentName + "</li>";
+                                                });
+                                                makeTag += "</div>";
+                                            }
                                             makeTag += "</ul>";
                                             break;
 

--
Gitblit v1.8.0