Merge branch dev/story-75383 of zentao/zentaopms (#9655)

2025-06-19 08:33:17 +08:00
parent 6b6cc48d1f 4ec52538ce
commit 9ef4299aeb
3 changed files with 22 additions and 38 deletions
@@ -2718,7 +2718,7 @@ class actionModel extends model
            ->where($condition)
            ->andWhere("`date`")->ge($lastDate)
            ->andWhere("`date`")->lt($lastDate . ' 23:59:59')
-            ->andWhere('action.id' . $direction . $lastActionID)
+            ->andWhere("`date` {$direction} '{$lastAction->date}'")
            ->orderBy($this->session->actionOrderBy)
            ->limit($limit)
            ->fetchAll('id', false);