From 571503a6f8d3ef2eb3d6929d4a584644fff7c896 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 15:53:04 +0900
Subject: [PATCH] 이슈 업체 메일 보내기 수정
---
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index 14d5895..b90049a 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -126,9 +126,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,12 +189,19 @@
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.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) {
@@ -203,13 +210,22 @@
var id = "";
angular.forEach(parameter.partners, function (partner) {
id = partner.id;
- account = partner.account.split(",");
+ account = partner.account;
+ if(account.indexOf(",") !== -1) {
+ account = partner.account.split(",");
+ }
name = partner.name;
});
- 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();
+ if(account.size > 1) {
+ for (var i = 0; i < account.size; i++) {
+ $scope.vm.form.account[0].account[i] = account[i].trim();
+ $scope.vm.form.account[0].name[i] = name;
+ $scope.vm.form.account[0].id[i] = id;
+ }
+ } else {
+ $scope.vm.form.account[0].account[i] = account;
$scope.vm.form.account[0].name[i] = name;
+ $scope.vm.form.account[0].id[i] = id;
}
}
}
--
Gitblit v1.8.0