From f8141855b0616b15b7b10912b6aaeea4df91c62c Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sun, 8 Aug 2021 22:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=A8=A1=E5=9D=97=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=8E=92=E9=99=A4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/base/Page.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/extend/base/Page.php b/extend/base/Page.php
index 966e41740..ec0990177 100755
--- a/extend/base/Page.php
+++ b/extend/base/Page.php
@@ -24,6 +24,7 @@ class Page
 	private $number;
 	private $bt_number;
 	private $where;
+	private $not_fields;
 	private $page_total;
 	private $url;
 	private $html;
@@ -31,19 +32,21 @@ class Page
 
 	/**
 	 * [__construct description]
-	 * @param [int]    $param['total'] 		[数据总数]
-	 * @param [int]    $param['number'] 	[每页数据条数]
-	 * @param [int]    $param['bt_number'] 	[分页显示按钮个数]
-	 * @param [array]  $param['where'] 		[额外条件(键值对)]
-	 * @param [string] $param['url'] 		[url地址]
+	 * @param [int]    $params['total'] 		[数据总数]
+	 * @param [int]    $params['number'] 		[每页数据条数]
+	 * @param [int]    $params['bt_number'] 	[分页显示按钮个数]
+	 * @param [array]  $params['where'] 		[额外条件(键值对)]
+	 * @param [array]  $params['not_fields'] 	[不参与条件拼接的字段]
+	 * @param [string] $params['url'] 			[url地址]
 	 */
-	public function __construct($params = array())
+	public function __construct($params = [])
 	{
 		$this->page = max(1, isset($params['page']) ? intval($params['page']) : 1);
 		$this->total = max(1, isset($params['total']) ? intval($params['total']) : 1);
 		$this->number = max(1, isset($params['number']) ? intval($params['number']) : 1);
 		$this->bt_number = isset($params['bt_number']) ? intval($params['bt_number']) : 2;
 		$this->where = (isset($params['where']) && is_array($params['where'])) ? $params['where'] : '';
+		$this->not_fields = (!empty($params['not_fields']) && is_array($params['not_fields'])) ? $params['not_fields'] : [];
 		$this->url = isset($params['url']) ? $params['url'] : '';
 		$this->page_total = 1;
 		$this->html = '';
@@ -70,7 +73,7 @@ class Page
 			$tmp = true;
 			foreach($this->where as $k=>$v)
 			{
-				if(!is_array($v))
+				if(!in_array($k, $this->not_fields) && !is_array($v))
 				{
 					if($k == 'page') continue;
 					
-- 
GitLab