From ca0d04fb89c0e786d7efdba6e6c9adde01dc3215 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 21 Mar 2024 07:40:15 +0000
Subject: [PATCH]  * Adjust attend review.

---
 module/my/model.php         | 5 ++++-
 module/my/ui/audit.html.php | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/my/model.php b/module/my/model.php
index 9c56022b30..e63303928d 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -1256,7 +1256,10 @@ class myModel extends model
             }
             else
             {
-                $objectGroup[$objectType] = $this->dao->select('*')->from($table)->where('id')->in($idList)->andWhere('deleted')->eq('0')->fetchAll('id');
+                $objectGroup[$objectType] = $this->dao->select('*')->from($table)
+                    ->where('id')->in($idList)
+                    ->beginIF(strpos(',attend,overtime,makeup,leave,lieu,', ",{$objectType},") === false)->andWhere('deleted')->eq('0')->fi()
+                    ->fetchAll('id');
             }
         }
 
diff --git a/module/my/ui/audit.html.php b/module/my/ui/audit.html.php
index 692512fcaf..b753a01daf 100644
--- a/module/my/ui/audit.html.php
+++ b/module/my/ui/audit.html.php
@@ -47,7 +47,11 @@ foreach($reviewList as $review)
 
     $statusList = array();
     if(isset($lang->$type->statusList)) $statusList = $lang->$type->statusList;
-    if($type == 'attend')               $statusList = $lang->attend->reviewStatusList;
+    if($type == 'attend')
+    {
+        $this->app->loadLang('attend');
+        $statusList = $lang->attend->reviewStatusList;
+    }
 
     if(!in_array($type, array('demand', 'story', 'testcase', 'feedback', 'review')) && !$isOAObject)
     {