Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/notice_push.js

@@ -84,10 +84,7 @@ module.exports = app => {
          * @param {Integer} uid - 查询人id
          */
         async getNoticeByDataCollect(pid, tenderIds = []) {
-            const wheres = { pid };
-            if (tenderIds.length > 0) {
-                wheres.tid = tenderIds;
-            }
+            const wheres = { pid, tid: tenderIds.length > 0 ? tenderIds : '' };
             let notice = await this.db.select(this.tableName, {
                 where: wheres,
                 orders: [['create_time', 'desc']],