Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-11-15 9e1224315ff031c5cfccda6ccb0d7841729d8612

 src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js

@@ -81,6 +81,13 @@
                                            }
                                            break;

                                        //  프로젝트 이름(프로젝트 리스트에서 사용)
                                        case "PROJECT_BASIC_NAME" :
                                                if (scope.data.projectVo != null) {
                                                    makeTag += "<span class='titlenameSelect'>" + myToken + scope.data.projectVo.name.replace(/</gi, '&lt;') + "</span>";
                                                }
                                            break;

                                        //  프로젝트 목록에서 사용자 정의 필드 설정 표시
                                        case "CUSTOM_FIELD_CONFIG" :
                                            //  관리자만 수정할 수 있다.
@@ -135,10 +142,10 @@
                                        case "USE_DEPARTMENT_LIST" :
                                            makeTag += "<ul class='ul-not-comma'>";

                                            if(scope.data.departmentVos.length == 0){ //속해있는 부서가 없을 경우
                                                makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id)'>부서를 선택 해주세요.</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' ng-click='event.modifyUserDepartments(data.id)'>";
                                                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>";
                                                });
@@ -352,6 +359,10 @@
                                            }
                                            break;

                                        case "DEPARTMENT_EX":
                                            makeTag += "<div style='margin-top: 5px;'>" + scope.data.departmentDescription + "</div>";
                                            break;

                                        case "DEPARTMENT_COUNT":
                                            if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) {
                                                makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyDepartmentCount(data.id)'>" + scope.data.departmentCount + "</span>";