From 7a46bc3dec70657a5ca5e53e0419086f114f2d28 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 5 Aug 2021 14:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=EF=BC=9A=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/db/GroupMail.ts  | 6 +++---
 shared/db/ServerMail.ts | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shared/db/GroupMail.ts b/shared/db/GroupMail.ts
index df4f7b2f2..1c29b0ed8 100644
--- a/shared/db/GroupMail.ts
+++ b/shared/db/GroupMail.ts
@@ -56,7 +56,7 @@ export default class GroupMail extends MailTemp {
                 $or: [{
                     roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.READ}}, hasGoods:false
                 }, {
-                    roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.RECEIVED}}, hasGoods: true
+                    roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.RECEIVED}}
                 }]
             },
             { $set:{ 'roleStatus.$.status': MAIL_STATUS.DELETE } }, 
@@ -76,7 +76,7 @@ export default class GroupMail extends MailTemp {
             $or: [{
                 roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.READ}}, hasGoods:false
             }, {
-                roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.RECEIVED}}, hasGoods: true
+                roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.RECEIVED}}
             }]
         },).select('_id').lean();
         const result: GroupMailType[] = [];
@@ -118,7 +118,7 @@ export default class GroupMail extends MailTemp {
     }
 
     public static async findReadAndRewardsMails(roleId: string, lean = true) {
-        const ids: GroupMailType[] = await GroupMailModel.find({ sendTime:{$lte: nowSeconds()}, roleStatus: { $elemMatch: { roleId,  $or:[ {$and: [{status: MAIL_STATUS.READ}, { hasGoods: true }]},{status: MAIL_STATUS.RECEIVED} ] } } }).select('_id').lean(lean);
+        const ids: GroupMailType[] = await GroupMailModel.find({ sendTime:{$lte: nowSeconds()}, roleStatus: { $elemMatch: { roleId,  $or:[ {$and: [{status: MAIL_STATUS.READ}, { hasGoods: false }]},{status: MAIL_STATUS.RECEIVED} ] } } }).select('_id').lean(lean);
         return ids;
     }
 
diff --git a/shared/db/ServerMail.ts b/shared/db/ServerMail.ts
index 027d0eae4..890078a19 100644
--- a/shared/db/ServerMail.ts
+++ b/shared/db/ServerMail.ts
@@ -66,7 +66,7 @@ export default class ServerMail extends MailTemp {
                 $or: [{
                     roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.READ}}, hasGoods:false
                 }, {
-                    roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.RECEIVED}}, hasGoods: true
+                    roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.RECEIVED}}
                 }]
             },
             { $set:{ 'roleStatus.$.status': MAIL_STATUS.DELETE, $push: { 'delRoles': roleId } } }, 
@@ -87,7 +87,7 @@ export default class ServerMail extends MailTemp {
                 $or: [{
                     roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.READ}}, hasGoods:false
                 }, {
-                    roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.RECEIVED}}, hasGoods: true
+                    roleStatus: {$elemMatch: {roleId, status: MAIL_STATUS.RECEIVED}}
                 }]
             }
         ).select('_id').lean();