Tony Kang 3 months ago
parent
commit
7b6d440255
1 changed files with 9 additions and 6 deletions
  1. 9 6
      app/controller/report_controller.js

+ 9 - 6
app/controller/report_controller.js

@@ -429,8 +429,9 @@ module.exports = app => {
                 const isAdmin = ctx.session.sessionUser.is_admin;
                 const lastAuditor = null;
                 const archiveList = [];
-                let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(tender.pid);
-                prjAccList = prjAccList.filter(pa => pa.enable !== 0);
+                // let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(tender.pid);
+                // prjAccList = prjAccList.filter(pa => pa.enable !== 0);
+                let prjAccList = await ctx.service.projectAccount.getAllSubProjectAccount(ctx.subProject);
                 const roleList = await ctx.service.signatureRole.getSignatureRolesByTenderId(tender.id);
                 const usedList = await ctx.service.signatureUsed.getSignatureUsedByTenderId(tender.id);
                 // 根据需求,如果开启了‘开启个人「签字」’功能,则只能是本身用户签名,管理员例外
@@ -579,8 +580,9 @@ module.exports = app => {
                 const isAdmin = ctx.session.sessionUser.is_admin;
                 const lastAuditor = null;
                 const archiveList = [];
-                let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(pid);
-                prjAccList = prjAccList.filter(pa => pa.enable !== 0);
+                // let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(pid);
+                // prjAccList = prjAccList.filter(pa => pa.enable !== 0);
+                let prjAccList = await ctx.service.projectAccount.getAllSubProjectAccount(ctx.subProject);
                 const roleList = [];
                 const usedList = [];
                 // 根据需求,如果开启了‘开启个人「签字」’功能,则只能是本身用户签名,管理员例外
@@ -794,8 +796,9 @@ module.exports = app => {
                     archiveList = JSON.parse(archives[0].content);
                 }
 
-                let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(pid);
-                prjAccList = prjAccList.filter(pa => pa.enable !== 0);
+                // let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(pid);
+                // prjAccList = prjAccList.filter(pa => pa.enable !== 0);
+                let prjAccList = await ctx.service.projectAccount.getAllSubProjectAccount(ctx.subProject);
                 const roleList = [];
                 const usedList = await ctx.service.signatureUsed.getSignatureUsedByTenderId(tenderId);
                 // 根据需求,如果开启了‘开启个人「签字」’功能,则只能是本身用户签名,管理员例外