modify：邮件发送

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -317,21 +317,26 @@ public class ChangeFlowBiz {
      */
     public void qcSendEmail(String changeCommander, String subjectParam, EmailTemplateEnum emailTemplateEnum,
         Map<String, Object> param) {
-        IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
-        iusDepartmentReq.setHasOrgPos(true);
-        iusDepartmentReq.setIcac(true);
-        iusDepartmentReq.setUids(Collections.singletonList(changeCommander));
-        HashMap<String, List<SecondaryDepartments>> map = iusService.queryDepartment(iusDepartmentReq);
-        log.info("[qcSendEmail] subjectParam:{}, map:{}", subjectParam, map);
-        List<SecondaryDepartments> secondaryDepartments = map.get(changeCommander);
-        List<String> ccList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(secondaryDepartments)) {
-            ccList = secondaryDepartments.stream().map(SecondaryDepartments::getUid).collect(Collectors.toList());
+        try {
+            IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
+            iusDepartmentReq.setHasOrgPos(true);
+            iusDepartmentReq.setIcac(true);
+            iusDepartmentReq.setUids(Collections.singletonList(changeCommander));
+            HashMap<String, List<SecondaryDepartments>> map = iusService.queryDepartment(iusDepartmentReq);
+            log.info("[qcSendEmail] subjectParam:{}, map:{}", subjectParam, map);
+            List<SecondaryDepartments> secondaryDepartments = map.get(changeCommander);
+            List<String> ccList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(secondaryDepartments)) {
+                ccList = secondaryDepartments.stream().map(SecondaryDepartments::getUid).collect(Collectors.toList());
+            }
+            // 变更管理QM，所有邮件都要发
+            ccList.add(appConfig.getChangeManageQM());
+            iEmailService.sendEmail(Collections.singletonList(changeCommander), ccList, param, emailTemplateEnum,
+                subjectParam);
+        } catch (Exception e) {
+            log.error("[op:qcSendEmail] error,changeCommander:{}, subjectParam:{}, e:{}", changeCommander, subjectParam,
+                e);
         }
-        // 变更管理QM，所有邮件都要发
-        ccList.add(appConfig.getChangeManageQM());
-        iEmailService.sendEmail(Collections.singletonList(changeCommander), ccList, param, emailTemplateEnum,
-            subjectParam);
     }
 
     private List<ChangeFile> buildChangeFileRecord(Long changeRecordId, List<ChangeFlowFile> files, Integer type) {

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/SupplierSendService.java

@@ -39,14 +39,18 @@ public class SupplierSendService {
 
     public void sendSupplierEmail(String supplier, String subjectParam, EmailTemplateEnum emailTemplateEnum,
         Map<String, Object> param) {
-        SupplierSendEmailReq req = new SupplierSendEmailReq();
-        req.setSupplierId(supplier);
-        req.setMailSubject(subjectParam);
-        EmailFactor factor = EmailFactor.builder().data(param).emailTemplateEnum(emailTemplateEnum)
-            .subject(req.getMailSubject()).type(EmailTypeEnum.HTML.getType()).build();
-        req.setMailContent(this.content(factor));
-        log.debug("[sendSupplierEmail] 发送供应商邮件内容 subjectParam:{}, req:{}", subjectParam, JSON.toJSONString(req));
-        flowRpcSupplierSendService.sendEmail(req);
+        try {
+            SupplierSendEmailReq req = new SupplierSendEmailReq();
+            req.setSupplierId(supplier);
+            req.setMailSubject(subjectParam);
+            EmailFactor factor = EmailFactor.builder().data(param).emailTemplateEnum(emailTemplateEnum)
+                .subject(req.getMailSubject()).type(EmailTypeEnum.HTML.getType()).build();
+            req.setMailContent(this.content(factor));
+            log.debug("[sendSupplierEmail] 发送供应商邮件内容 subjectParam:{}, req:{}", subjectParam, JSON.toJSONString(req));
+            flowRpcSupplierSendService.sendEmail(req);
+        } catch (Exception e) {
+            log.error("[op:sendSupplierEmail] error,supplier:{},subjectParam:{}, e:{}", supplier, subjectParam, e);
+        }
     }
 
     /**

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowDeliverReq.java

@@ -33,6 +33,5 @@ public class ChangeFlowDeliverReq {
     /**
      * 转交备注
      */
-    @NotBlank(message = "转交备注不可为空")
     private String remark;
 }
\ No newline at end of file