瀏覽代碼

refactor: 待关注返回推送记录进行同类型去重取最新

lanjianrong 5 年之前
父節點
當前提交
6bd125bfda
共有 2 個文件被更改,包括 10 次插入3 次删除
  1. 0 1
      app/service/material_audit.js
  2. 10 2
      app/service/notice_push.js

+ 0 - 1
app/service/material_audit.js

@@ -634,7 +634,6 @@ module.exports = app => {
                 delete v.content
                 return { ...v, ...extra }
             })
-            console.log('notice', notice)
             return notice;
         }
 

+ 10 - 2
app/service/notice_push.js

@@ -40,13 +40,21 @@ module.exports = app => {
             let notice =  await this.db.select(this.tableName, {
                 where: { pid, uid },
                 orders: [['create_time', 'desc']],
-                limit: 10, offset: 0
+                limit: 30, offset: 0
             });
             notice = notice.map(v => {
                 const extra = JSON.parse(v.content)
                 delete v.content
                 return { ...v, ...extra }
-            }).sort((a, b) => a.name === b.name)
+            }).sort((a, b) => a.name === b.name).reduce((prev, curr, idx) => {
+                if (!prev.length) {
+                    prev.push(curr)
+                }
+                if (prev[idx-1] && curr.tid !== prev[idx-1].tid) {
+                    prev.push(curr)
+                }
+                return prev
+            }, [])
             return notice;
         }
     }