From ed1a1163a4701612ad1880d2b8c4779f41783fe0 Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Tue, 27 May 2025 14:21:59 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Dashboard.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php
index c260fcf..760e029 100755
--- a/application/admin/controller/Dashboard.php
+++ b/application/admin/controller/Dashboard.php
@@ -110,19 +110,24 @@ class Dashboard extends Backend
     public function task()
     {
 
+        $dateTime = \date('Y-m-d H:i:s');
+
         $dayTasks =  (new Task())
             ->where('exec_admin_id','=',$this->auth->id)
             ->where('type','=',1)
+            ->where('expire_end_time','>=', $dateTime)
             ->select();
 
         $weekTasks =  (new Task())
             ->where('exec_admin_id','=',$this->auth->id)
             ->where('type','=',2)
+            ->where('expire_end_time','>=', $dateTime)
             ->select();
 
         $monthTasks =  (new Task())
             ->where('exec_admin_id','=',$this->auth->id)
             ->where('type','=',3)
+            ->where('expire_end_time','>=', $dateTime)
             ->select();
 
         $this->view->assign('day', $dayTasks);