Revert "更新search"

This reverts commit aeca0e3936e8ce7ea9d1767c6c9ecdc8b3b85b33.

crmeb/app/dao/BaseDao.php

@@ -318,36 +318,31 @@ abstract class BaseDao
     /**
      * 根据搜索器获取搜索内容
      * @param $where
-     * @param $search
      * @return BaseModel
      * @throws \ReflectionException
      * @author 吴汐
      * @email 442384644@qq.com
      * @date 2023/03/18
      */
-    protected function withSearchSelect($where, $search)
+    protected function withSearchSelect($where)
     {
         [$with, $otherWhere] = $this->getSearchData($where);
-        if (!$search) {
-            $otherWhere = [];
-        }
         return $this->getModel()->withSearch($with, $where)->where($otherWhere);
     }
 
     /**
      * 搜索
      * @param array $where
-     * @param bool $search
      * @return BaseModel
      * @throws \ReflectionException
      * @author 吴汐
      * @email 442384644@qq.com
      * @date 2023/03/18
      */
-    protected function search(array $where = [], $search = true)
+    protected function search(array $where = [])
     {
         if ($where) {
-            return $this->withSearchSelect($where, $search);
+            return $this->withSearchSelect($where);
         } else {
             return $this->getModel();
         }

crmeb/app/dao/activity/combination/StoreCombinationDao.php

@@ -39,7 +39,7 @@ class StoreCombinationDao extends BaseDao
      */
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['pinkIngTime']), function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['pinkIngTime']), function ($query) use ($where) {
             $time = time();
             [$startTime, $stopTime] = is_array($where['pinkIngTime']) ? $where['pinkIngTime'] : [$time, $time];
             $query->where('start_time', '<=', $startTime)->where('stop_time', '>=', $stopTime);
@@ -100,7 +100,6 @@ class StoreCombinationDao extends BaseDao
                 $query->page($page, $limit);
             })->order('sort desc,id desc')->select()->toArray();
     }
-
     /**获取列表
      * @param array $where
      * @param int $page
@@ -165,7 +164,6 @@ class StoreCombinationDao extends BaseDao
     {
         return $this->search($where)->with('getPrice')->page($page, $limit)->order('sort desc,id desc')->select()->toArray();
     }
-
     /**
      * 条件获取数量
      * @param array $where
@@ -175,7 +173,6 @@ class StoreCombinationDao extends BaseDao
     {
         return $this->search($where)->count();
     }
-
     /**
      * 页面设计获取商拼团列表
      * @param array $where
@@ -186,11 +183,9 @@ class StoreCombinationDao extends BaseDao
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function diyCombinationList(array $where, int $page, int $limit)
-    {
+    public function diyCombinationList(array $where, int $page, int $limit){
         return $this->search($where)->with('getCategory')->page($page, $limit)->order('sort desc,id desc')->select()->toArray();
     }
-
     /**
      * 根据id获取拼团数据
      * @param array $ids

crmeb/app/dao/activity/coupon/StoreCouponIssueDao.php

@@ -38,7 +38,7 @@ class StoreCouponIssueDao extends BaseDao
      */
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['type']) && $where['type'] != '', function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['type']) && $where['type'] != '', function ($query) use ($where) {
             if ($where['type'] == 'send') {
                 $query->where('receive_type', 3)->where(function ($query1) {
                     $query1->where(function ($query2) {

crmeb/app/dao/activity/integral/StoreIntegralOrderDao.php

@@ -48,7 +48,7 @@ class StoreIntegralOrderDao extends BaseDao
         $realName = $where['real_name'] ?? '';
         $fieldKey = $where['field_key'] ?? '';
         $fieldKey = $fieldKey == 'all' ? '' : $fieldKey;
-        return parent::search($where, false)->when($isDel, function ($query) use ($where) {
+        return parent::search($where)->when($isDel, function ($query) use ($where) {
             $query->where('is_del', $where['is_del']);
         })->when(isset($where['is_system_del']), function ($query) {
             $query->where('is_system_del', 0);

crmeb/app/dao/activity/lottery/LuckLotteryDao.php

@@ -34,7 +34,7 @@ class LuckLotteryDao extends BaseDao
 
     public function search(array $data = [])
     {
-        return parent::search($data, false)->when(isset($data['id']) && $data['id'], function ($query) use ($data) {
+        return parent::search($data)->when(isset($data['id']) && $data['id'], function ($query) use ($data) {
             $query->where('id', $data['id']);
         })->when(isset($data['start']) && $data['start'] !== '', function ($query) use ($data) {
             $time = time();

crmeb/app/dao/activity/seckill/StoreSeckillDao.php

@@ -39,7 +39,7 @@ class StoreSeckillDao extends BaseDao
      */
     protected function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['seckllTime']), function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['seckllTime']), function ($query) use ($where) {
             [$startTime, $stopTime] = is_array($where['seckllTime']) ? $where['seckllTime'] : [time(), time() - 86400];
             $query->where('start_time', '<=', $startTime)->where('stop_time', '>=', $stopTime);
         })->when(isset($where['sid']) && $where['sid'], function ($query) use ($where) {

crmeb/app/dao/article/ArticleDao.php

@@ -32,7 +32,7 @@ class ArticleDao extends BaseDao
 
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['ids']) && count($where['ids']), function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['ids']) && count($where['ids']), function ($query) use ($where) {
             $query->whereNotIn('id', $where['ids']);
         });
     }

crmeb/app/dao/order/OtherOrderDao.php

@@ -163,7 +163,7 @@ class OtherOrderDao extends BaseDao
 
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['name']) && $where['name'], function ($query) use($where){
+        return parent::search($where)->when(isset($where['name']) && $where['name'], function ($query) use($where){
             $query->where('uid', 'in', function ($que) use($where){
                 $nickname = trim($where['name']);
                 $que->name('user')->where('nickname', 'like', $nickname.'%')->field(['uid'])->select();

crmeb/app/dao/order/StoreCartDao.php

@@ -49,7 +49,7 @@ class StoreCartDao extends BaseDao
      */
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['id']) && $where['id'], function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['id']) && $where['id'], function ($query) use ($where) {
             $query->whereIn('id', $where['id']);
         })->when(isset($where['status']), function ($query) use ($where) {
             //兼容之前老用户 数据库默认值null

crmeb/app/dao/order/StoreOrderDao.php

@@ -41,7 +41,6 @@ class StoreOrderDao extends BaseDao
      * 订单搜索
      * @param array $where
      * @return \crmeb\basic\BaseModel|mixed|\think\Model
-     * @throws \ReflectionException
      */
     public function search(array $where = [])
     {
@@ -49,7 +48,7 @@ class StoreOrderDao extends BaseDao
         $realName = $where['real_name'] ?? '';
         $fieldKey = $where['field_key'] ?? '';
         $fieldKey = $fieldKey == 'all' ? '' : $fieldKey;
-        return parent::search($where, false)->when($isDel, function ($query) use ($where) {
+        return parent::search($where)->when($isDel, function ($query) use ($where) {
             $query->where('is_del', $where['is_del']);
         })->when(isset($where['is_system_del']), function ($query) {
             $query->where('is_system_del', 0);

crmeb/app/dao/order/StoreOrderInvoiceDao.php

@@ -40,7 +40,7 @@ class StoreOrderInvoiceDao extends BaseDao
         $fieldKey = $fieldKey == 'all' ? '' : $fieldKey;
         $type = $where['type'] ?? '';
         unset($where['type']);
-        return parent::search($where, false)->when($type, function ($query) use ($type) {
+        return parent::search($where)->when($type, function ($query) use ($type) {
             switch ($type) {
                 case 1://待开
                     $query->where('is_invoice', 0)->where('invoice_time', 0)->where('is_refund', 0);

crmeb/app/dao/order/StoreOrderRefundDao.php

@@ -26,7 +26,7 @@ class StoreOrderRefundDao extends BaseDao
         $realName = $where['real_name'] ?? '';
         $fieldKey = $where['field_key'] ?? '';
         $fieldKey = $fieldKey == 'all' ? '' : $fieldKey;
-        return parent::search($where, false)->when(isset($where['refund_type']) && $where['refund_type'] !== '', function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['refund_type']) && $where['refund_type'] !== '', function ($query) use ($where) {
             if ($where['refund_type'] == 0) {
                 $query->where('refund_type', '>', 0);
             } else {

crmeb/app/dao/service/StoreServiceAuxiliaryDao.php

@@ -29,7 +29,7 @@ class StoreServiceAuxiliaryDao extends AuxiliaryDao
      */
     protected function search(array $where = [])
     {
-        return parent::search($where, false)->where('type', 0);
+        return parent::search($where)->where('type', 0);
     }
 
 }

crmeb/app/dao/system/attachment/SystemAttachmentCategoryDao.php

@@ -62,7 +62,7 @@ class SystemAttachmentCategoryDao extends BaseDao
      */
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['id']), function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['id']), function ($query) use ($where) {
             $query->whereIn('id', $where['id']);
         });
     }

crmeb/app/dao/system/config/SystemStorageDao.php

@@ -68,7 +68,7 @@ class SystemStorageDao extends BaseDao
      */
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['type']), function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['type']), function ($query) use ($where) {
             $query->where('type', $where['type']);
         })->where('is_delete', 0)->when(isset($where['access_key']), function ($query) use ($where) {
             $query->where('access_key', $where['access_key']);

crmeb/app/dao/user/UserBrokerageFrozenDao.php

@@ -38,7 +38,7 @@ class UserBrokerageFrozenDao extends BaseDao
      */
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['isFrozen']), function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['isFrozen']), function ($query) use ($where) {
             if ($where['isFrozen']) {
                 $query->where('frozen_time', '>', time());
             } else {

crmeb/app/dao/wechat/WechatKeyDao.php

@@ -35,7 +35,7 @@ class WechatKeyDao extends BaseDao
      */
     public function search(array $where = [])
     {
-        return parent::search($where, false)->when(isset($where['id']), function ($query) use ($where) {
+        return parent::search($where)->when(isset($where['id']), function ($query) use ($where) {
             $query->where('id', $where['id']);
         });
     }