- 이슈 담당부서 수정시 프로젝트 내의 부서로 검색 가능하도록 수정 - 이슈 유형의 '사용 프로젝트'의 담당부서를 '워크플로우'의 담당...

이민희

2022-02-10 1ff84ea2402eed9d97b4a57837a93edd61f557c0

 src/main/webapp/scripts/components/utils/autoComplete.controller.js

@@ -33,6 +33,7 @@
                $scope.fn.getUserList = getUserList;    //  사용자 목록 정보를 조회한다.
                $scope.fn.getProjectList = getProjectList;  //  프로젝트 목록 정보를 조회한다.
                $scope.fn.getIssueList = getIssueList;  //  일감 목록 정보를 조회한다.
                $scope.fn.getParentIssueList = getParentIssueList;   // 상위 이슈 목록 정보를 조회한다.
                $scope.fn.getRelIssueList = getRelIssueList;   // 연관 이슈 목록 정보를 조회한다.
                $scope.fn.getDownIssueList = getDownIssueList;  //  하위 이슈 목록 정보를 조회한다.
                $scope.fn.getWorkflowList = getWorkflowList;    //  워크플로우 목록 정보를 조회한다.
@@ -175,7 +176,7 @@
                    return deferred.promise;
                }

                function getRelIssueList(query, issueTypeId, excludeList, page, callBack) {
                function getParentIssueList(query, issueTypeId, excludeList, page, callBack) {
                    var conditions = {
                        name : query,
                        excludeIds : (function () {
@@ -185,6 +186,54 @@
                                excludeIds.push(exclude.id);
                            });
                            return excludeIds;
                        })()
                    };

                    var deferred = $q.defer();

                    if ($rootScope.isDefined(page) && page > 0) {
                        $rootScope.spinner = true;
                    }

                    Issue.find($resourceProvider.getContent(
                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
                        if (result.data.message.status === "success") {
                            if ($rootScope.isDefined(callBack)) {
                                callBack(result);
                            }
                            deferred.resolve(result.data.data);
                        }
                        else {
                            SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "워크플로우 목록 조회 실패"
                        }
                        $rootScope.spinner = false;
                    });
                    return deferred.promise;
                }

                function getRelIssueList(parentYN, project, query, issueTypeId, excludeList, page, callBack) {
                    var conditions = {
                        name : query,
                        excludeIds : (function () {
                            var excludeIds = [];

                            angular.forEach(excludeList, function (exclude) {
                                excludeIds.push(exclude.id);
                            });
                            return excludeIds;
                        })(),
                        parentYN : parentYN,
                        projectIds : (function () {
                            var projectIds = [];
                            if (project != null) {
                                if (project.length < 1) {
                                    SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), $filter("translate")("common.selectToProjectListLookUp"), "error"); // "프로젝트를 먼저 선택 해 주세요."
                                }
                                if ($rootScope.isDefined(project[0])) {
                                    projectIds.push(project[0].id);
                                }
                            }
                            return projectIds;
                        })()
                    };

@@ -385,8 +434,8 @@
                    var deferred = $q.defer();


                    //워크플로우에 속해있는 담당부서 찾기
                    UserWorkspace.findWorkflowDepartment($resourceProvider.getContent(         //  페이징 업데이트가 필요한 컴포넌트 일경우, page 업데이트가 있을 경우 기본 10개씩 가져오고 아닐경우 25개씩 가져온다.
                    //프로젝트에 속해있는 담당부서 찾기
                    UserWorkspace.findProjectDepartment($resourceProvider.getContent(         //  페이징 업데이트가 필요한 컴포넌트 일경우, page 업데이트가 있을 경우 기본 10개씩 가져오고 아닐경우 25개씩 가져온다.
                        conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
                        if (result.data.message.status === "success") {
                            const departments = result.data.data;