From d3b7687149535b5d98a2a97ee05cce13ed8f6ef8 Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Thu, 22 Feb 2024 14:07:24 +0800
Subject: [PATCH] * Fix calculate effort not filter deleted data.

---
 module/metric/dataset.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/metric/dataset.php b/module/metric/dataset.php
index f34272adf5..e5cdf654d9 100644
--- a/module/metric/dataset.php
+++ b/module/metric/dataset.php
@@ -797,7 +797,8 @@ class dataset
             ->from(TABLE_EFFORT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution=t2.id')
             ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project=t3.id')
-            ->where('t3.deleted')->eq('0')
+            ->where('t1.deleted')->eq('0')
+            ->andWhere('t3.deleted')->eq('0')
             ->andWhere('t3.type')->eq('project');
 
         return $this->defaultWhere($stmt, 't3')->query();