From 6a916b069c73ad7def95ad72ae848125544bc309 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 22 2월 2022 15:40:08 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index c0041f5..6850762 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -172,6 +172,9 @@
@Value("${total.statistics.email}")
private String totalStatisticsEmail; // �봽濡쒖젥�듃, �씠�뒋, �궗�슜�옄�닔 �븣由�
+ @Value("${email.joinEmail}")
+ private boolean bJoinEmail;
+
@Autowired
private ExcelView excelView;
@@ -292,8 +295,9 @@
userMap.put("registerDate", DateUtil.convertDateToYYYYMMDD(user.getRegisterDate()));
// �쉶�썝 媛��엯 �븣由� 硫붿씪 �쟾�넚
- this.systemEmailService.directEmail(new String[]{user.getAccount()}, EmailType.WORKSPACE_JOIN, userMap, null);
-
+ if(bJoinEmail) {
+ this.systemEmailService.directEmail(new String[]{user.getAccount()}, EmailType.WORKSPACE_JOIN, userMap, null);
+ }
return user;
}
--
Gitblit v1.8.0