From a04289c6689a642c3b5a9b79b8c35740afc4673a Mon Sep 17 00:00:00 2001
From: xjh <2423579486@qq.com>
Date: Thu, 4 May 2023 20:18:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:TOOL::getOptionalQuery=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=8F=AF=E4=BC=A0=E5=85=A5=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/exception/Tool.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/common/exception/Tool.php b/app/common/exception/Tool.php
index 8dbff81..933f314 100644
--- a/app/common/exception/Tool.php
+++ b/app/common/exception/Tool.php
@@ -251,9 +251,20 @@ class Tool
      */
     public static function getOptionalQuery(array ...$data)
     {
-        $params = Request::param();
+        $params = [];
         $con = [];
 
+        //请求参数获取
+        if (isset($data[0]['params']) && $data[0]['params']) {
+            //自定义
+            $params = $data[0]['params'];
+            unset($data[0]);
+            $data = array_merge($data);
+        } else {
+            //自动获取
+            $params = Request::param();
+        }
+
         //处理联表字段
         $dealJoinField = function (string $field_name): string {
             $stripos_val = stripos($field_name, '.');