From fed164fcc7b782f1d773cdfc10a3d9f44264c8cd Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 화, 28 12월 2021 22:39:19 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/scripts/app/issue/issueAddRelation.controller.js | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js index b13739f..a99d138 100644 --- a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js @@ -39,6 +39,7 @@ containsPartner : containsPartner, getPartners : getPartners, addRelationIssue : addRelationIssue, + getDepartments : getDepartments }; $scope.vm = { @@ -168,6 +169,8 @@ $scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) { $scope.vm.partnerVos = $scope.fn.getPartners(); + $scope.vm.form.departments = []; + getDepartments(Number(newValue)); }); // �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶 @@ -923,6 +926,27 @@ } + function getDepartments(issueTypeId) { + if($rootScope.isDefined(issueTypeId) && $scope.vm.form.issueTypeId === ""){ + $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id + } + var content = { + issueTypeId : $scope.vm.form.issueTypeId, + }; + Issue.findReadyDepartments($resourceProvider.getContent( + content, + $resourceProvider.getPageContent(0, 1))).then(function (result) { + if (result.data.message.status === "success") { + $scope.vm.form.departments = []; + angular.forEach(result.data.data, function (department) { + department.byName = department.departmentName; + $scope.vm.form.departments.push(department); + }); + } + }); + + } + // 理쒖큹 �떎�뻾 function startExecute() { @@ -930,7 +954,8 @@ getIssueTypes : $scope.fn.getIssueTypes(), getPriorities : $scope.fn.getPriorities(), getSeverities : $scope.fn.getSeverities(), - getPartners : $scope.fn.getPartners() + getPartners : $scope.fn.getPartners(), + //getDepartments : $scope.fn.getDepartments() }; $q.all(promises).then(function (results) { // �쁽�옱 �봽濡쒖젥�듃 �꽕�젙 -- Gitblit v1.8.0