From 3127401ebf5567d5e2f8523629fe2bae8ce16f00 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Sat, 7 Oct 2023 10:17:47 +0800
Subject: [PATCH] * Adjust usage report.

---
 module/screen/model.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/screen/model.php b/module/screen/model.php
index 2a4ae84843..187ba62124 100644
--- a/module/screen/model.php
+++ b/module/screen/model.php
@@ -1879,9 +1879,11 @@ class screenModel extends model
 
         return $this->dao->select('id,name')->from(TABLE_PROJECT)
             ->where('type')->eq('project')
-            ->andWhere('date(openedDate)')->le($date)
-            ->andWhere('date(closedDate)')->gt($date)
             ->andWhere('deleted')->eq('0')
+            ->andWhere('date(openedDate)')->le($date)
+            ->andWhere('date(closedDate)', true)->gt($date)
+            ->orWhere('date(closedDate)')->eq('0000-00-00')
+            ->markRight(true)
             ->fetchPairs();
     }
 }