Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/service/change_audit.js

@@ -302,10 +302,10 @@ module.exports = app => {
                         '  FROM (SELECT * FROM ?? WHERE `user_id` = ? OR `id` in (SELECT `tid` FROM ?? WHERE `uid` = ? GROUP BY `tid`)) As t' +
                         '  LEFT JOIN ?? As c ON c.`tid` = t.`id`' +
                         '  LEFT JOIN ?? As ca ON ca.`cid` = c.`cid`' +
-                        '  WHERE t.`project_id` = ? and `ca`.`sin_time` > ? and `ca`.`usite` != 0' +
+                        '  WHERE t.`project_id` = ? and `ca`.`sin_time` > ? and `ca`.`usite` != 0 and `ca`.`status` != ?' +
                         '  ORDER By ca.`sin_time` DESC LIMIT 1000) as new_t GROUP BY new_t.`id`' +
                         '  ORDER BY new_t.`cu_time`';
-            const sqlParam = [this.ctx.service.tender.tableName, uid, this.tableName, uid, this.ctx.service.change.tableName, this.tableName, pid, time];
+            const sqlParam = [this.ctx.service.tender.tableName, uid, this.tableName, uid, this.ctx.service.change.tableName, this.tableName, pid, time, audit.flow.status.checking];
             return await this.db.query(sql, sqlParam);
         }