- 업체메일 발송 시 파트너의 메일주소가 없을 경우 필터링 해주기 - 전체 프로젝트로 선택 되어있는 경우에도 이슈 만들때 이슈타입과 프...

이민희

2022-01-20 d888528b8472fc67f966b48359879dcd6bcd01ff

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

@@ -101,6 +101,8 @@
                //  사용자 삭제
                function removeMailTarget(index) {
                    $scope.vm.form.account[0].account.splice(index, 1);
                    $scope.vm.form.account[0].name.splice(index, 1);
                    $scope.vm.form.account[0].id.splice(index, 1);
                }

                function formCheck(formInvalid) {
@@ -126,9 +128,9 @@
                        sendEmails : (function () {
                            var sendEmails = [];

                            angular.forEach($scope.vm.form.mailUsers, function (user) {
                                sendEmails.push($rootScope.encryption(user.account));
                            });
                            for(var i=0; i < $scope.vm.form.account[0].account.length; i++) {
                                sendEmails.push($rootScope.encryption($scope.vm.form.account[0].account[i]));
                            }

                            return sendEmails;
                        })(),
@@ -189,27 +191,52 @@
                        var index = partners.length-1;
                        var id = partners[index].id;
                        var name = partners[index].name;
                        var account = partners[index].account.split(",");
                        var account = partners[index].account;

                        for (var i = 0; i < account.length; i++) {
                            $scope.vm.form.account[0].id[index+i] = id;
                            $scope.vm.form.account[0].account[index+i] = account[i].trim();
                            $scope.vm.form.account[0].name[index+i] = name;
                        if(account != null && account.indexOf(",") !== -1) {
                            account = partners[index].account.split(",");
                            for (var i = 0; i < account.length; i++) {
                                $scope.vm.form.account[0].account[index+i] = account[i].trim();
                                $scope.vm.form.account[0].name[index+i] = name;
                                $scope.vm.form.account[0].id[index+i] = id;
                            }
                        } else {
                            $scope.vm.form.account[0].account[index] = account;
                            $scope.vm.form.account[0].name[index] = name;
                            $scope.vm.form.account[0].id[index] = id;
                        }
                    } else {
                        if (parameter.partners != null) {
                            var account = "";
                            var name = "";
                            var id = "";
                            var accountArr = [];
                            var nameArr = [];
                            var idArr =[];
                            angular.forEach(parameter.partners, function (partner) {
                                id = partner.id;
                                account = partner.account.split(",");
                                account = partner.account;
                                name = partner.name;
                                if(account != null && account.indexOf(",") !== -1) {
                                    //메일주소가 여러개일경우 분리 및 공백 제거
                                    account = partner.account.split(",");
                                    for (var i = 0; i < account.length; i++) {
                                        accountArr.push(account[i].trim());
                                        nameArr.push(name);
                                        idArr.push(id);
                                    }
                                } else if(account != null) {
                                    accountArr.push(account);
                                    nameArr.push(name);
                                    idArr.push(id);
                                }
                            });
                            for (var i = 0; i < account.length; i++) {
                                $scope.vm.form.account[0].id[i] = id;
                                $scope.vm.form.account[0].account[i] = account[i].trim();
                                $scope.vm.form.account[0].name[i] = name;
                            if(accountArr != null && accountArr.length > 0) {
                                for (var i = 0; i < accountArr.length; i++) {
                                    $scope.vm.form.account[0].account[i] = accountArr[i];
                                    $scope.vm.form.account[0].name[i] = nameArr[i];
                                    $scope.vm.form.account[0].id[i] = idArr[i];
                                }
                            }
                        }
                    }