bug#2999

app/controller/report_controller.js

@@ -1249,20 +1249,24 @@ function mergeSignAudit(pageData, currRoleRelList, currAuditList) {
         if (page.signature_audit_cells) {
             for (const sCell of page.signature_audit_cells) {
                 sCell.Value = ''; // 这里要先清除原有信息
-                for (const role_rel of currRoleRelList) {
-                    if (sCell.signature_name === role_rel.signature_name + '_审核意见') {
-                        let preDate = '';
-                        sCell.Value = '同意'; // 只有选择了签名的，才需要初始化一个默认的意见(之前的逻辑在有多个签名，哪怕只选择了一个，其他的意见都会有默认意见)
-                        for (const audit_rel of currAuditList) {
-                            if (role_rel.acc_id === audit_rel.aid) {
-                                if (audit_rel.end_time > preDate && audit_rel.status === 3) {
-                                    sCell.Value = audit_rel.opinion;
-                                    preDate = audit_rel.end_time;
+                if (currRoleRelList && currRoleRelList.length > 0) {
+                    for (const role_rel of currRoleRelList) {
+                        if (sCell.signature_name === role_rel.signature_name + '_审核意见') {
+                            let preDate = '';
+                            sCell.Value = '同意'; // 只有选择了签名的，才需要初始化一个默认的意见(之前的逻辑在有多个签名，哪怕只选择了一个，其他的意见都会有默认意见)
+                            if (currAuditList && currAuditList.length > 0) {
+                                for (const audit_rel of currAuditList) {
+                                    if (role_rel.acc_id === audit_rel.aid) {
+                                        if (audit_rel.end_time > preDate && audit_rel.status === 3) {
+                                            sCell.Value = audit_rel.opinion;
+                                            preDate = audit_rel.end_time;
+                                        }
+                                        // 不能break，实际会有多个审核意见，以最后一个为准
+                                    }
                                 }
-                                // 不能break，实际会有多个审核意见，以最后一个为准
                             }
+                            break;
                         }
-                        break;
                     }
                 }
             }
@@ -1280,19 +1284,21 @@ function mergeSignDate(pageData, current_stage_id, currRoleRelList, STAGE_AUDIT,
             }
         }
     }
-    for (const page of pageData.items) {
-        if (page.signature_date_cells) {
-            for (const sCell of page.signature_date_cells) {
-                sCell.Value = _getSignDateDftName();
-                for (const role_rel of currRoleRelList) {
-                    if (sCell.signature_name === role_rel.signature_name + '_签字日期') {
-                        if (role_rel.sign_date !== '') {
-                            if (typeof role_rel.sign_date === 'string') {
-                                role_rel.sign_date = new Date(role_rel.sign_date);
+    if (currRoleRelList && currRoleRelList.length > 0) {
+        for (const page of pageData.items) {
+            if (page.signature_date_cells) {
+                for (const sCell of page.signature_date_cells) {
+                    sCell.Value = _getSignDateDftName();
+                    for (const role_rel of currRoleRelList) {
+                        if (sCell.signature_name === role_rel.signature_name + '_签字日期') {
+                            if (role_rel.sign_date !== '') {
+                                if (typeof role_rel.sign_date === 'string') {
+                                    role_rel.sign_date = new Date(role_rel.sign_date);
+                                }
+                                sCell.Value = role_rel.sign_date.Format(role_rel.sign_date_format);
                             }
-                            sCell.Value = role_rel.sign_date.Format(role_rel.sign_date_format);
+                            break;
                         }
-                        break;
                     }
                 }
             }