laiguoran 3 лет назад
Родитель
Сommit
4d3443edb6
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      app/controller/report_archive_controller.js

+ 3 - 2
app/controller/report_archive_controller.js

@@ -57,7 +57,7 @@ module.exports = app => {
                     }
                 }
                 // const archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[stageList.length - 1].id);
-                const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, stageList[stageList.length - 1].id);
+                const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, ctx.stage.id);
                 // stage_id = stageList[0].id;
                 // stage_order = stageList[0].order;
                 // stage_times = stageList[0].times;
@@ -435,6 +435,7 @@ module.exports = app => {
                 if (archives.length > 0) {
                     archiveList = JSON.parse(archives[0].content);
                 }
+                console.log('2:', archiveEncryptions, ctx.stage.id);
                 if (archiveEncryptions.length > 0) {
                     archiveEncryptionList = JSON.parse(archiveEncryptions[0].content);
                 }
@@ -450,7 +451,7 @@ module.exports = app => {
                     }
                 }
 
-                const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, stageList[stageList.length - 1].id);
+                const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, ctx.stage.id);
                 // stage_id = stageList[0].id;
                 // stage_order = stageList[0].order;
                 // stage_times = stageList[0].times;