From 463fa90f8aee31140cbb7205ee23e501ed2e648b Mon Sep 17 00:00:00 2001
From: dongpd <dongpd@beetinnovators.com>
Date: Fri, 13 Nov 2020 10:45:14 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bugs=20default=20th=E1=BB=9Di=20gian=20th?=
 =?UTF-8?q?=E1=BB=91ng=20k=C3=AA=20t=E1=BA=A5t=20c=E1=BA=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/LogsController.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/controllers/LogsController.php b/controllers/LogsController.php
index 782ddf3d..c7ba4e57 100644
--- a/controllers/LogsController.php
+++ b/controllers/LogsController.php
@@ -99,7 +99,7 @@ class LogsController extends Controller {
                     'stateArray' => Logs::$stateArray,
                     'eventTypeArray' => EventType::eventTypeArray(),
                     'departmentArray' => Department::departmentArray(),
-                    'f' => $f,
+                    'f' => $f == 0 ? 1 : $f,
                     't' => $t
         ]);
     }
@@ -145,8 +145,7 @@ class LogsController extends Controller {
         $objPHPExcel->setActiveSheetIndex(0);
         $toExcelFile[] = ["Thời gian", "Mã nhân viên", "Tên nhân viên", "Phòng ban", "Mã thẻ", "Thiết bị", "Cửa", "Trạng thái vào/ra", "Mô tả sự kiện"];
         $query = Logs::find();
-        if ($f != $t)
-            $query->andWhere(["BETWEEN", 'time', $f, $t]);
+        $query->andWhere(["BETWEEN", 'time', $f, $t]);
         $query->orderBy(["time" => SORT_DESC]);
         $logs = $query->all();
         $departmentArray = Department::departmentArray();