From 94bc0a6bad49e818e54a5438a6f202448de05ee0 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 26 1월 2022 15:51:16 +0900
Subject: [PATCH] - 이슈 수정 시 대분류만 선택하고 수정 시 오류 해결 - 전체 댓글 + 메일 보기 / 하위 이슈 댓글 + 메일 보기

---
 src/main/webapp/scripts/app/issue/issueAdd.controller.js |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index b99941e..054abd1 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -554,7 +554,7 @@
                     if ($rootScope.isDefined(result[0])) {
                         $scope.vm.form.parentSectorId = result[0].id;
                     }
-
+                    $scope.vm.form.childSectorId = "";
                     $scope.vm.form.childSector = "";
                     $scope.vm.form.childSectors = [];
                 });
@@ -681,35 +681,35 @@
                         companyMemo : $scope.vm.companyMemo,
                         companyTypeId : (function () {
                             var companyTypeId = -1;
-                            if ($scope.vm.form.companyTypes != null) {
+                            if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
                                 companyTypeId = $scope.vm.form.companyTypes[0].id;
                             }
                             return companyTypeId;
                         })(),
                         parentSectorId : (function () {
                             var parentSectorId = -1;
-                            if ($scope.vm.form.parentSectors != null) {
+                            if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
                                 parentSectorId = $scope.vm.form.parentSectors[0].id;
                             }
                             return parentSectorId;
                         })(),
                         childSectorId : (function () {
                             var childSectorId = -1;
-                            if ($scope.vm.form.childSectors != null) {
+                            if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
                                 childSectorId = $scope.vm.form.childSectors[0].id;
                             }
                             return childSectorId;
                         })(),
                         regionId : (function () {
                             var regionId = -1;
-                            if ($scope.vm.form.regions != null) {
+                            if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
                                 regionId = $scope.vm.form.regions[0].id;
                             }
                             return regionId;
                         })(),
                         statusId : (function () {
                             var statusId = -1;
-                            if ($scope.vm.form.statuses != null) {
+                            if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
                                 statusId = $scope.vm.form.statuses[0].id;
                             } else if ($scope.vm.form.status !== ""){
                                 statusId = 120; //吏곸젒�엯�젰 �씪 寃쎌슦
@@ -849,9 +849,12 @@
                         $resourceProvider.getPageContent(0, 1000))).then(function (result) {
 
                         if (result.data.message.status === "success") {
-                            $scope.vm.form.projects.push(result.data.data);
-                            $scope.vm.projectName = result.data.data.name;
-                            $scope.fn.getIssueTypeOfProject();
+                            if ($rootScope.isDefined(result.data.data)) {
+                                $scope.vm.form.projects.push(result.data.data);
+                                $scope.vm.projectName = result.data.data.name;
+                                $scope.fn.getIssueTypeOfProject();
+                                $scope.fn.getIssueTypeCustomFields();
+                            }
                         }
                         else {
                             SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // �씠�뒋 ���엯 紐⑸줉 議고쉶 �떎�뙣
@@ -867,9 +870,9 @@
                 function getIssueTypes() {
                     var deferred = $q.defer();
 
-                    /*if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
+                    if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
                         return;
-                    }*/
+                    }
 
                     IssueType.find($resourceProvider.getContent({},
                         $resourceProvider.getPageContent(0, 1000))).then(function (result) {
@@ -916,6 +919,7 @@
 
                         if (result.data.message.status === "success") {
                             $scope.vm.priorities = result.data.data;
+                            $scope.vm.form.priorityId = $scope.vm.priorities[2].id.toString();
                         }
                         else {
                             SweetAlert.swal($filter("translate")("issue.failedToPriorityListLookup"), result.data.message.message, "error"); // �슦�꽑�닚�쐞 紐⑸줉 議고쉶 �떎�뙣
@@ -936,6 +940,7 @@
 
                         if (result.data.message.status === "success") {
                             $scope.vm.severities = result.data.data;
+                            $scope.vm.form.severityId = $scope.vm.severities[2].id.toString();
                         }
                         else {
                             SweetAlert.swal($filter("translate")("issue.failedToCriticalListLookup"), result.data.message.message, "error"); // 以묒슂�룄 紐⑸줉 議고쉶 �떎�뙣
@@ -1046,7 +1051,7 @@
                 }
 
                 function getPartners() {
-                    if($scope.vm.form.issueTypeId === ""){
+                    if($scope.vm.form.issueTypeId === "" && $rootScope.issueTypeMenu != null){
                         $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
                     }
                     var content = {
@@ -1062,7 +1067,7 @@
                 }
 
                 function getDepartments() {
-                    if($scope.vm.form.issueTypeId === ""){
+                    if($scope.vm.form.issueTypeId === "" && $rootScope.issueTypeMenu != null){
                         $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
                     }
                     var content = {

--
Gitblit v1.8.0