Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/report_archive_controller.js

@@ -581,7 +581,7 @@ module.exports = app => {
                 if (archiveEncryptions.length > 0) {
                     archiveEncryptionList = JSON.parse(archiveEncryptions[0].content);
                 }
-            } else {
+            } else if (stageList.length > 0 && stageList[0].status === auditConst.stage.status.checked) {
                 // console.log('stageList[0].id: ' + stageList[0].id);
                 // const archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[stageList.length - 1].id);
                 let archives = [];
@@ -592,8 +592,7 @@ module.exports = app => {
                         break;
                     }
                 }
-
-
+                ctx.stage = ctx.stage ? ctx.stage : stageList[stageList.length - 1];
                 const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, ctx.stage.id);
                 // stage_id = stageList[0].id;
                 // stage_order = stageList[0].order;

app/view/report/index_sign.ejs

@@ -481,7 +481,7 @@
                                     srcBytes: result2,
                                     certEncode: res.certCode,
                                     selMode: 1,
-                                    sealImageEncode: base64Set(netcaSignData.sign_base64),
+                                    sealImageEncode: netcaSignData.sign_base64,
                                     revInfoIncludeFlag: false,
                                     SignPosition: {
                                         startPage: 1,