diff --git a/app/adminapi/lists/recharge/RechargeLists.php b/app/adminapi/lists/recharge/RechargeLists.php
index 12fe639dd..a7ac7ce62 100755
--- a/app/adminapi/lists/recharge/RechargeLists.php
+++ b/app/adminapi/lists/recharge/RechargeLists.php
@@ -104,17 +104,17 @@ class RechargeLists extends BaseAdminDataLists implements ListsSearchInterface,
      */
     public function lists(): array
     {
-        $companyIds = CompanyLogic::getAllCompanyIds();
+        // $companyIds = CompanyLogic::getAllCompanyIds();
         $field = 'ro.id,ro.sn,ro.order_amount,ro.pay_way,ro.pay_time,ro.pay_status,ro.create_time,ro.refund_status';
-        $field .= ',u.avatar,u.nickname,a.company_id';
+        $field .= ',u.avatar,u.nickname,u.company_id';
         $lists = RechargeOrder::alias('ro')
             ->join('user u', 'u.id = ro.user_id')
             ->join('admin a', 'u.admin_id = a.id')
-            ->join('company c', 'a.company_id = c.id')
+            ->join('company c', 'u.company_id = c.id')
             ->field($field)
             ->where($this->queryWhere())
             ->where($this->searchWhere)
-            ->where('c.id', 'in', $companyIds)
+            // ->where('c.id', 'in', $companyIds)
             ->order('ro.id', 'desc')
             ->limit($this->limitOffset, $this->limitLength)
             ->append(['pay_status_text', 'pay_way_text'])
diff --git a/app/adminapi/lists/task_template/TaskTemplateLists.php b/app/adminapi/lists/task_template/TaskTemplateLists.php
index f8e7bd277..eee030e33 100644
--- a/app/adminapi/lists/task_template/TaskTemplateLists.php
+++ b/app/adminapi/lists/task_template/TaskTemplateLists.php
@@ -38,7 +38,7 @@ class TaskTemplateLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function setSearch(): array
     {
         return [
-            '=' => ['title', 'admin_id', 'money', 'type', 'status', 'content'],
+            '=' => ['title', 'admin_id', 'money', 'type', 'status', 'content','company_id'],
         ];
     }
 
@@ -54,14 +54,7 @@ class TaskTemplateLists extends BaseAdminDataLists implements ListsSearchInterfa
      */
     public function lists(): array
     {
-        $parmas= $this->request->param();
-        $where=[];
-        if(isset($parmas['scheduling_id']) && $parmas['scheduling_id']>0){
-            $company_id=TaskScheduling::where(['id'=>$parmas['scheduling_id']])->value('company_id');
-            $where[]= ['company_id','=',$company_id];
-        }
         return TaskTemplate::where($this->searchWhere)
-            ->where($where)
             ->with(['admin','data_type'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])