From 1aa6861445439849d8de1facc142b503ea35af50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= <zhujinyong@cnezsoft.com>
Date: Fri, 14 Apr 2023 01:24:17 +0000
Subject: [PATCH] * Fix bug #34095.

---
 module/my/model.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/my/model.php b/module/my/model.php
index 92f9060ccc..84f4b3cdca 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -1380,24 +1380,26 @@ class myModel extends model
         if(empty($actionField)) $actionField = 'date';
         $orderBy = $actionField . '_' . $direction;
 
-        $condition = "(action = 'reviewed' or action = 'approvalreview')";
+        $condition = "(`action` = 'reviewed' or `action` = 'approvalreview')";
         if($browseType == 'createdbyme')
         {
             $condition  = "(objectType in('story','case','feedback') and action = 'submitreview') OR ";
             $condition .= "(objectType = 'review' and action = 'opened') OR ";
             $condition .= "(objectType = 'attend' and action = 'commited') OR ";
-            $condition .= "(action = 'approvalsubmit') OR ";
+            $condition .= "(`action` = 'approvalsubmit') OR ";
             $condition .= "(objectType in('leave','makeup','overtime','lieu') and action = 'created')";
             $condition  = "($condition)";
         }
-
-        $actions = $this->dao->select('objectType,objectID,actor,action,MAX(`date`) as `date`,extra')->from(TABLE_ACTION)
+        $actionIdList = $this->dao->select('MAX(`id`) as `id`')->from(TABLE_ACTION)
             ->where('actor')->eq($this->app->user->account)
             ->andWhere('vision')->eq($this->config->vision)
             ->andWhere($condition)
             ->groupBy('objectType,objectID')
             ->orderBy($orderBy)
-            ->page($pager, 'objectType,objectID')
+            ->page($pager)
+            ->fetchPairs();
+        $actions = $this->dao->select('objectType,objectID,actor,action,`date`,extra')->from(TABLE_ACTION)
+            ->where('id')->in($actionIdList)
             ->fetchAll();
         $objectTypeList = array();
         foreach($actions as $action) $objectTypeList[$action->objectType][] = $action->objectID;