From 3def8f7157bd6d217b2051f53a70f47042d5c5a7 Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Thu, 4 Dec 2025 08:50:09 +0330 Subject: [PATCH] up --- server/controllers/GPS.Award.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/controllers/GPS.Award.js b/server/controllers/GPS.Award.js index 4816de2..1d8e43e 100644 --- a/server/controllers/GPS.Award.js +++ b/server/controllers/GPS.Award.js @@ -27,7 +27,9 @@ module.exports.createAward = [ module.exports.findAllUser = async (req, res) => { const toDay = new Date() - const awards = await Award.find({ expireDate: { $gt: toDay }, isDeleted: false }) + const awards = await Award.find({ + // expireDate: { $gt: toDay }, + isDeleted: false }) const awardsReq = await AwardRequest.find({ userId: req.user_id }).populate('awardId', '-created_at -updated_at') const score = await GPSUser.findById(req.user_id, { score: 1 }) // eslint-disable-next-line array-callback-return @@ -49,7 +51,7 @@ module.exports.findAllUser = async (req, res) => { }, status: 1 } - } else { + } else if(award.expireDate < toDay){ return { id: award.id, score: award.score,