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

이민희

2021-12-28 743fb98986d528be8b3b5bfd6d99fb1cabcd82b9

 src/main/webapp/scripts/app/issue/issueAdd.controller.js

@@ -550,12 +550,10 @@

                            return attachedFileIds;
                        })(),

                        issueCompanyFields : (function () {
                            var issueCompanyFields = [];
                            if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
                                var companyField = $scope.vm.form.issueCompanyFields[0];

                                issueCompanyFields.push({
                                    companyId : $scope.vm.companyId,
                                    name : $scope.vm.companyName,
@@ -566,9 +564,14 @@
                                    memo : $scope.vm.companyMemo
                                });
                            }

                            return issueCompanyFields;
                        })(),
                        companyName : $scope.vm.companyName,
                        companyManager : $scope.vm.companyManager,
                        companyTel : $scope.vm.companyTel,
                        companyEmail :$scope.vm.companyEmail,
                        companyUrl :$scope.vm.companyUrl,
                        companyMemo : $scope.vm.companyMemo,

                        issueIspFields : (function () {
                            var issueIspFields = [];
@@ -576,7 +579,6 @@
                                && $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
                                || $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
                                var ispField = $scope.vm.form.issueIspFields[0];

                                issueIspFields.push({
                                    ispId : $scope.vm.ispId,
                                    name : $scope.vm.ispName,
@@ -587,11 +589,16 @@
                                    url :$scope.vm.ispUrl,
                                    memo : $scope.vm.ispMemo
                                });

                            }

                            return issueIspFields;
                        })(),
                        ispName : $scope.vm.ispName,
                        ispCode : $scope.vm.ispCode,
                        ispManager : $scope.vm.ispManager,
                        ispTel : $scope.vm.ispTel,
                        ispEmail :$scope.vm.ispEmail,
                        ispUrl :$scope.vm.ispUrl,
                        ispMemo : $scope.vm.ispMemo,

                        issueHostingFields : (function () {
                            var issueHostingFields = [];
@@ -599,7 +606,6 @@
                                && $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
                                || $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
                                var hostingField = $scope.vm.form.issueHostingFields[0];

                                issueHostingFields[0] = {
                                    hostingId : $scope.vm.hostingId,
                                    name : $scope.vm.hostingName,
@@ -613,6 +619,13 @@
                            }
                            return issueHostingFields;
                        })(),
                        hostingName : $scope.vm.hostingName,
                        hostingCode : $scope.vm.hostingCode,
                        hostingManager : $scope.vm.hostingManager,
                        hostingTel : $scope.vm.hostingTel,
                        hostingEmail :$scope.vm.hostingEmail,
                        hostingUrl :$scope.vm.hostingUrl,
                        hostingMemo : $scope.vm.hostingMemo,

                        startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
                        detectingDateRange : $scope.vm.form.detectingDateRange,
@@ -652,6 +665,7 @@
                        fileFormDataName : "file"
                    }).then(function (result) {
                        if (result.data.message.status === "success") {

                            //  연속 등록 체크시 이동하지 않음.
                            if ($scope.vm.infiniteAdd) {
                                $scope.fn.infiniteAddForm();
@@ -660,7 +674,9 @@
                                $scope.fn.cancel();

                                if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
                                    $state.go("issues.list");
                                    $state.go($state.current, {}, {reload : true});
                                    // $state.go("issues.list");
                                    // $state.go("dashboards.dashboard")
                                }
                            }