From 6b20b68f9d8f08a2bbe75a2e14dfcc52eaa97607 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 12 Aug 2023 11:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/task_scheduling/TaskSchedulingLists.php | 6 +++---
 app/common/model/Company.php                               | 2 +-
 app/common/model/task_scheduling/TaskScheduling.php        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/adminapi/lists/task_scheduling/TaskSchedulingLists.php b/app/adminapi/lists/task_scheduling/TaskSchedulingLists.php
index a6ae1a6ad..315eec8f9 100644
--- a/app/adminapi/lists/task_scheduling/TaskSchedulingLists.php
+++ b/app/adminapi/lists/task_scheduling/TaskSchedulingLists.php
@@ -61,14 +61,14 @@ class TaskSchedulingLists extends BaseAdminDataLists implements ListsSearchInter
                 $where[]=['party_a|party_b','in',$arr];
              }
          }
-         if(isset($params['area_manager']) && $params['area_manager']!=''){
-            $arr= Admin::where('name','like','%'.$params['area_manager'].'%')->column('id');
+         if(isset($params['create_user_id']) && $params['create_user_id']!=''){
+            $arr= Admin::where('name','like','%'.$params['create_user_id'].'%')->column('id');
             if($arr){
                 $where[]=['area_manager','in',$arr];
              }
          }
         return TaskScheduling::where($this->searchWhere)
-            ->with(['admin','company','company_type_name'])
+            ->with(['admin','company','company_type'])
             ->field(['id', 'create_user_id', 'template_id', 'company_id', 'company_type', 'status'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
diff --git a/app/common/model/Company.php b/app/common/model/Company.php
index f57c50744..62dcdbc6c 100644
--- a/app/common/model/Company.php
+++ b/app/common/model/Company.php
@@ -60,7 +60,7 @@ class Company extends BaseModel
 
     public function getContractAttr()
     {
-        $find=Contract::where('party_a', $this->id)->field('check_status,status')->find();
+        $find=Contract::where('party_a|party_b', $this->id)->field('check_status,status')->find();
         if($find){
             return $find->toArray();
         }else{
diff --git a/app/common/model/task_scheduling/TaskScheduling.php b/app/common/model/task_scheduling/TaskScheduling.php
index a1dc809a7..b7bbc4135 100644
--- a/app/common/model/task_scheduling/TaskScheduling.php
+++ b/app/common/model/task_scheduling/TaskScheduling.php
@@ -37,9 +37,9 @@ class TaskScheduling extends BaseModel
     {
         return $this->hasOne(Admin::class, 'id', 'create_user_id')->bind(['admin_name'=>'name']);
     }
-    public function companyTypeName()
+    public function companyType()
     {
-        return $this->hasOne(DictData::class, 'id', 'company_type')->bind(['company_type'=>'name']);
+        return $this->hasOne(DictData::class, 'id', 'company_type')->bind(['company_type_name'=>'name']);
     }
     public function template()
     {