Merge branch 'zth' into dev

src/views/baseinfo/TaskMail/TenantAuditStepModal.vue

@@ -270,18 +270,20 @@
           sortConditions: [],
         },
       })
-      arrRes.data.forEach((item) => {
+      if (values.attachments) {
-        values.attachments.forEach((e) => {
+        arrRes.data.forEach((item) => {
-          if (item.id == e) {
+          values.attachments.forEach((e) => {
-            attachments.push({
+            if (item.id == e) {
-              taskMailId: values.id,
+              attachments.push({
-              templateId: item.id,
+                taskMailId: values.id,
-              fileName: values[item.id] ? values[item.id] : item.templateName,
+                templateId: item.id,
-              fileType: values[`${item.id}-fileType`],
+                fileName: values[item.id] ? values[item.id] : item.templateName,
-            })
+                fileType: values[`${item.id}-fileType`],
-          }
+              })
+            }
+          })
         })
-      })
+      }
 
       values.attachments = attachments
       values.receivers = []