Browse Source

中间计量,加载审批人数据相关

MaiXinRong 2 years ago
parent
commit
3a86defe23
2 changed files with 4 additions and 2 deletions
  1. 1 1
      app/lib/rpt_data_analysis.js
  2. 3 1
      app/service/stage_audit_ass.js

+ 1 - 1
app/lib/rpt_data_analysis.js

@@ -1577,7 +1577,7 @@ const loadCooperationData = {
         if (!stageAuditAss || stageAuditAss.length === 0) return null;
         if (relaId.length > 0) {
             for (const id of relaId) {
-                const c = stageAuditAss.find(x => { return x.ass_ledger_id.indexOf(id) >= 0; });
+                const c = stageAuditAss.find(x => { return x.ass_ledger_id.indexOf(id + '') >= 0; });
                 if (c) return c;
             }
             return null;

+ 3 - 1
app/service/stage_audit_ass.js

@@ -174,7 +174,9 @@ module.exports = app => {
             const sql = 'SELECT saa.tid, saa.sid, saa.times, saa.user_id, saa.ass_ledger_id, saa.ass_user_id, saa.name, saa.company, saa.role, pa.sign_path, pa.stamp_path' +
                 `   FROM ${this.tableName} saa LEFT JOIN ${this.ctx.service.projectAccount.tableName} pa ON saa.ass_user_id = pa.id` +
                 `   WHERE saa.sid = ? AND saa.times = ?`;
-            return this.db.query(sql, [sid, stimes]);
+            const result = await this.db.query(sql, [sid, stimes]);
+            result.forEach(x => { x.ass_ledger_id = x.ass_ledger_id ? x.ass_ledger_id.split(',') : []});
+            return result;
         }
     }