Merge branch 'zth' into dev

邮件模板无附件问题
1 changed files with 13 additions and 11 deletions
--- a/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/TaskMail/TenantAuditStepModal.vue
@ -270,18 +270,20 @@
          sortConditions: [],
        },
      })
-      arrRes.data.forEach((item) => {
-        values.attachments.forEach((e) => {
-          if (item.id == e) {
-            attachments.push({
-              taskMailId: values.id,
-              templateId: item.id,
-              fileName: values[item.id] ? values[item.id] : item.templateName,
-              fileType: values[`${item.id}-fileType`],
-            })
-          }
+      if (values.attachments) {
+        arrRes.data.forEach((item) => {
+          values.attachments.forEach((e) => {
+            if (item.id == e) {
+              attachments.push({
+                taskMailId: values.id,
+                templateId: item.id,
+                fileName: values[item.id] ? values[item.id] : item.templateName,
+                fileType: values[`${item.id}-fileType`],
+              })
+            }
+          })
        })
-      })
+      }

      values.attachments = attachments
      values.receivers = []
Author	SHA1	Message	Date
张同海	61d95ca877	Merge branch 'zth' into dev	2 days ago
张同海	f1643def26	邮件模板无附件问题	2 days ago