Jelajahi Sumber

报表改动导致其他地方搜索失效

MaiXinRong 4 bulan lalu
induk
melakukan
1eab847b7b
2 mengubah file dengan 4 tambahan dan 3 penghapusan
  1. 1 1
      app/controller/report_controller.js
  2. 3 2
      app/service/project_account.js

+ 1 - 1
app/controller/report_controller.js

@@ -237,7 +237,7 @@ module.exports = app => {
                 }
                 // let prjAccList = await ctx.service.projectAccount.getAllAccountByProjectId(tender.data.project_id);
                 // prjAccList = prjAccList.filter(pa => pa.enable !== 0);
-                let prjAccList = await ctx.service.projectAccount.getAllSubProjectAccount(ctx.subProject);
+                let prjAccList = await ctx.service.projectAccount.getAllSubProjectAccount(ctx.subProject, ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile', 'company_id', 'account', 'telephone', 'permission', 'sign_path', 'stamp_path']);
                 const roleList = await ctx.service.signatureRole.getSignatureRolesByTenderId(tender.id);
                 const usedList = await ctx.service.signatureUsed.getSignatureUsedByTenderId(tender.id);
 

+ 3 - 2
app/service/project_account.js

@@ -1037,8 +1037,9 @@ module.exports = app => {
         }
 
         async getAllSubProjectAccount(subProject, columns) {
-            // const defaultColumns = ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile', 'company_id'];
-            const defaultColumns = ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile', 'company_id', 'account', 'telephone', 'permission', 'sign_path', 'stamp_path']; // 新加的字段给报表用
+            // 请勿随意修改defaultColumns
+            const defaultColumns = ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile', 'company_id'];
+            // const defaultColumns = ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile', 'company_id', 'account', 'telephone', 'permission', 'sign_path', 'stamp_path']; // 新加的字段给报表用
             const columnsSql = columns
                 ? columns.map(x => { return 'pa.`' + x + '`'; }).join(', ')
                 : defaultColumns.map(x => { return 'pa.`' + x + '`'; }).join(', ');