modify: 供应商邮件发送

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

@@ -344,6 +344,12 @@ public class ChangeFlowBiz {
             qcSendEmail(execUserEmailList, ccList, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
             // 如果是供应商，再次发送供应商邮件
             if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
+                sendSupplierEmail.sendSupplierEmail(changeRecord.getCreateSupplier(), subjectParam,
+                        EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
+            }
+            // 如果是其他端发起但是是供应商变更，再次发送供应商邮件
+            if (!changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
+                    && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
                 sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
                         EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
             }
@@ -365,6 +371,12 @@ public class ChangeFlowBiz {
         qcSendEmail(receiver, ccList, subjectParam, EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
         // 如果是供应商，再次发送供应商邮件
         if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())) {
+            sendSupplierEmail.sendSupplierEmail(changeRecord.getCreateSupplier(), subjectParam,
+                    EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
+        }
+        // 如果是其他端发起但是是供应商变更，再次发送供应商邮件
+        if (!changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.TONG_ZHOU.getType())
+                && ChangeSubjectEnum.SUPPLIER.getType().equals(changeRecord.getChangeSubject())) {
             sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
                     EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
         }
@@ -511,7 +523,6 @@ public class ChangeFlowBiz {
         // 变更结论
         changeRecord.setCreateSource(changeFlowCreateReq.getCreateSource());
         changeRecord.setCreateSupplier(changeFlowCreateReq.getSupplier());
-        changeRecord.setChangeSupplier(changeFlowCreateReq.getChangeSupplier());
         changeRecord.setCreateTime(DateUtils.getCurrentTime());
         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
         changeRecord.setCreator(uid);