From fff1fc3dd2efe99a4c85fe35e9165db98fb423c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 16 Sep 2021 10:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/base/Message.php         |  6 ------
 app/data/controller/base/Payment.php         |  6 ------
 app/data/controller/base/postage/Company.php | 11 ++++++-----
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/data/controller/base/Message.php b/app/data/controller/base/Message.php
index a1be48917..40b80fd8f 100644
--- a/app/data/controller/base/Message.php
+++ b/app/data/controller/base/Message.php
@@ -12,12 +12,6 @@ use think\admin\Controller;
  */
 class Message extends Controller
 {
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    private $table = 'BaseUserMessage';
-
     /**
      * 系统通知管理
      * @auth true
diff --git a/app/data/controller/base/Payment.php b/app/data/controller/base/Payment.php
index c08870b2c..e26ebefec 100644
--- a/app/data/controller/base/Payment.php
+++ b/app/data/controller/base/Payment.php
@@ -15,12 +15,6 @@ use think\admin\extend\CodeExtend;
  */
 class Payment extends Controller
 {
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    private $table = 'BaseUserPayment';
-
     /**
      * 支付通道类型
      * @var array
diff --git a/app/data/controller/base/postage/Company.php b/app/data/controller/base/postage/Company.php
index 1f0020900..ddf6ee4b8 100644
--- a/app/data/controller/base/postage/Company.php
+++ b/app/data/controller/base/postage/Company.php
@@ -25,16 +25,17 @@ class Company extends Controller
     public function index()
     {
         $this->title = '快递公司管理';
-        $query = BasePostageCompany::mQuery();
 
         // 加载对应数据
-        $this->type = $this->request->get('type', 'index');
-        if ($this->type === 'index') $query->where(['status' => 1]);
-        elseif ($this->type === 'recycle') $query->where(['status' => 0]);
+        $map = ['deleted' => 0];
+        $this->type = input('get.type', 'index');
+        if ($this->type === 'index') $map['status'] = 1;
+        if ($this->type === 'recycle') $map['status'] = 0;
 
         // 列表显示分页
+        $query = BasePostageCompany::mQuery();
         $query->like('name,code')->equal('status')->dateBetween('craete_at');
-        $query->where(['deleted' => 0])->order('sort desc,id desc')->page();
+        $query->where($map)->order('sort desc,id desc')->page();
     }
 
     /**