Commit c8a16e15 by Sixong.Zhu

Merge branch 'master' into pre

parents d0c59d98 c5752ec7
Showing with 9 additions and 6 deletions
......@@ -375,7 +375,7 @@ class ChatCacheDatabaseController {
public appendMessages(chat: number, items: Message[]) {
return new Promise<void>((resolve) => {
if (!this.db || !items.length) {
if (!this.db || !items || !items.length) {
return resolve();
}
const store = this.buildChatMessageStore(chat);
......
......@@ -138,16 +138,19 @@ class OrderService {
r.pageData.rows,
orderPayItemPredict
);
items = items.filter(
(i) =>
i.status !== PayStatus.Deleted &&
i.status !== PayStatus.Cancel
);
if (!withActions) {
items = items.filter(
(i) =>
i.status !== PayStatus.Deleted &&
i.status !== PayStatus.Cancel
);
}
if (withActions) {
for (let i = 0; i < r.pageData.rows.length; i++) {
r.pageData &&
r.pageData.rows &&
r.pageData.rows[i] &&
items[i] &&
(items[i].actions = r.pageData.rows[i].actions);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment