Merge branch 'master' into 'sprint/231_zg_65782'

# Conflicts: # module/story/control.php
2022-08-25 00:51:00 +00:00
parent c424e450cb 589934c524
commit 297a416762
62 changed files with 632 additions and 286 deletions
@@ -1569,7 +1569,6 @@ class bugModel extends model
            $bugCount = $this->dao->select("count(id) as num, date_format($field, '%m/%d') as date")->from(TABLE_BUG)
                ->where('product')->eq($productID)
                ->andWhere($field)->ne('0000-00-00 00:00:00')
-                ->andWhere($field)->ne('')
                ->andWhere('deleted')->eq(0)
                ->andWhere($field)->between($startDate, $endDate . ' 23:50:59')
                ->groupBy('date')