diff --git a/config/params.php b/config/params.php index a82a4bf9..6fcd1344 100644 --- a/config/params.php +++ b/config/params.php @@ -3,7 +3,7 @@ return [ "hideInfomation" => false, "TCTECH" => true, - "CardService" => "192.168.1.166:2001", + "CardService" => "192.168.3.73:2001", "dataPath" => "AC/", "time" => 1606755599, "pageSize" => 200 diff --git a/controllers/LogsController.php b/controllers/LogsController.php index 55841be9..782ddf3d 100644 --- a/controllers/LogsController.php +++ b/controllers/LogsController.php @@ -145,7 +145,8 @@ 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(); - $query->andWhere(["BETWEEN", 'time', $f, $t]); + if ($f != $t) + $query->andWhere(["BETWEEN", 'time', $f, $t]); $query->orderBy(["time" => SORT_DESC]); $logs = $query->all(); $departmentArray = Department::departmentArray(); diff --git a/views/schedule/form.tpl b/views/schedule/form.tpl index 85264bfa..567463aa 100644 --- a/views/schedule/form.tpl +++ b/views/schedule/form.tpl @@ -91,7 +91,7 @@