记录

app-hd/controllers/BalanceChangeController.php

@@ -16,13 +16,6 @@ class BalanceChangeController extends BaseController
         $get = Yii::$app->request->get();
         $where = [];
         $where['mainId'] = $this->mainId;
-        $searchTime = $get['searchTime'] ?? '';
-        if (!empty($searchTime)) {
-            $startTime = $get['startTime'] ?? '';
-            $endTime = $get['endTime'] ?? '';
-            $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
-            $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
-        }
         $customId = $get['customId'] ?? 0;
         if (!empty($customId)) {
             $custom = CustomClass::getById($customId, true);
@@ -35,6 +28,13 @@ class BalanceChangeController extends BaseController
             }
             $where['customId'] = $customId;
         }
+        $searchTime = $get['searchTime'] ?? '';
+        if (!empty($searchTime)) {
+            $startTime = $get['startTime'] ?? '';
+            $endTime = $get['endTime'] ?? '';
+            $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
+            $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
+        }
         $respond = BalanceChangeClass::getChangeList($where);
         util::success($respond);
     }