shish 2 лет назад
Родитель
Сommit
a59d8ccc38
1 измененных файлов с 3 добавлено и 5 удалено
  1. 3 5
      app-ghs/controllers/ShopYeChangeController.php

+ 3 - 5
app-ghs/controllers/ShopYeChangeController.php

@@ -26,17 +26,15 @@ class ShopYeChangeController extends BaseController
         if (!empty($tx)) {
             $where['tx'] = $tx;
         }
-
         $searchTime = isset($get['searchTime']) && !empty($get['searchTime']) ? $get['searchTime'] : '';
-        if (!empty($searchTime)) {
-            $startTime = $get['startTime'] ?? '';
-            $endTime = $get['endTime'] ?? '';
+        $startTime = $get['startTime'] ?? '';
+        $endTime = $get['endTime'] ?? '';
+        if (!empty($searchTime) || !empty($startTime)) {
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime, true);
             $start = $period['startTime'];
             $end = $period['endTime'];
             $where['addTime'] = ['between', [$start, $end]];
         }
-
         $list = ShopYeChangeClass::getChangeList($where);
         util::success($list);
     }