From b8f62a12c2e04853a29121035a85cf83871d08cd Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 12 Aug 2023 10:10:41 +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/user/UserLists.php | 7 ++-----
 app/common/model/user/User.php        | 9 +++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/lists/user/UserLists.php b/app/adminapi/lists/user/UserLists.php
index 3f4c9aa24..578b4c89a 100755
--- a/app/adminapi/lists/user/UserLists.php
+++ b/app/adminapi/lists/user/UserLists.php
@@ -67,17 +67,14 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
 
             }
         }
-        $field = "id,sn,nickname,sex,avatar,account,mobile,channel,create_time,admin_id,company_id,street,street as street_name,is_contract";
+        $field = "id,id contract,sn,nickname,sex,avatar,account,mobile,channel,create_time,admin_id,company_id,street,street as street_name,is_contract";
         $lists = User::withSearch($this->setSearch(), $this->params)
             ->with(['company'])
             ->where($where)
             ->limit($this->limitOffset, $this->limitLength)
             ->field($field)
             ->order('id desc')
-            ->select()->each(function($item, $key){
-               $find= Contract::where('type',2)->where('party_b',$item['id'])->field('id,party_a,party_b,check_status')->find();
-                $item['contract'] = $find;
-            })
+            ->select()
             ->toArray();
 
         foreach ($lists as &$item) {
diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php
index f79ae86fd..b1049706e 100755
--- a/app/common/model/user/User.php
+++ b/app/common/model/user/User.php
@@ -214,4 +214,13 @@ class User extends BaseModel
             return [];
         }
     }
+
+    public function getContractAttr(){
+        $find= Contract::where('type',2)->where('party_b',$this->id)->field('id,party_a,party_b,check_status')->find();
+        if($find){
+            return $find->toArray();
+        }else{
+            return [];
+        }
+    }
 }
\ No newline at end of file