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

wyu

2021-12-01 15fb5ce02c159e88059b95aa62db1e037f358fdf

 src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java

@@ -97,7 +97,6 @@
                        locale = CommonUtil.getUserLanguage(loginUser.getLanguage());
                    }
                }

                this.makeDirectContextEmail(emailType, params, locale, new String[]{CommonUtil.decryptAES128(sendUser)});
            }
        }
@@ -179,19 +178,19 @@
                content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context);
                break;

            case ISSUE_SEND_1:    //  이슈 이메일로 대상자에게 발송
            case ISSUE_SEND_1:    //  이슈 이메일 템플릿1로 대상자에게 발송
                mailConstants = MailConstants.ISSUE_SEND_1;
                context = StringTemplateUtil.makeContext(params, locale);
                content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context);
                break;

            case ISSUE_SEND_2:    //  이슈 이메일로 대상자에게 발송
            case ISSUE_SEND_2:    //  이슈 이메일 템플릿2로 대상자에게 발송
                mailConstants = MailConstants.ISSUE_SEND_2;
                context = StringTemplateUtil.makeContext(params, locale);
                content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context);
                break;

            case ISSUE_SEND_3:    //  이슈 이메일로 대상자에게 발송
            case ISSUE_SEND_3:    //  이슈 이메일 템플릿3로 대상자에게 발송
                mailConstants = MailConstants.ISSUE_SEND_3;
                context = StringTemplateUtil.makeContext(params, locale);
                content = this.springTemplateEngine.process(mailConstants.getMailTemplate(), context);