Merge branch dev/bug-65644 of zentao/zentaopms (#11633)

2025-09-23 17:44:25 +08:00
parent 4dc417c5aa d7d3b79e03
commit 0549df77f7
1 changed files with 1 additions and 1 deletions
@@ -1953,7 +1953,7 @@ class actionModel extends model

        $beginAndEnd = $this->computeBeginAndEnd($period, '', $direction);
        $hasProduct = preg_match('/t2\.(`?)product/', $condition);
-        $condition  = preg_replace("/AND +`?date`?\s?(<|>|<=|>=)\s?'\d{4}\-\d{2}\-\d{2}'/", '', $condition);
+        $condition  = preg_replace("/AND +`?date`?\s*(<|>|<=|>=)\s*'\d{4}\-\d{2}\-\d{2}'/", '', $condition);
        $actions    = $this->dao->select('action.id')->from(TABLE_ACTION)->alias('action')
            ->beginIF($hasProduct)->leftJoin(TABLE_ACTIONPRODUCT)->alias('t2')->on('action.id=t2.action')->fi()
            ->where($condition)