From 7f985283ad5bce02b6728dd457987458a9f0dcee Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 2 Aug 2023 13:54: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        | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/user/UserLists.php b/app/adminapi/lists/user/UserLists.php
index bd1299e7c..f3f2247e9 100755
--- a/app/adminapi/lists/user/UserLists.php
+++ b/app/adminapi/lists/user/UserLists.php
@@ -16,6 +16,7 @@ namespace app\adminapi\lists\user;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\enum\user\UserTerminalEnum;
 use app\common\lists\ListsExcelInterface;
+use app\common\model\contract\Contract;
 use app\common\model\user\User;
 use think\facade\Db;
 
@@ -68,7 +69,11 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
             ->limit($this->limitOffset, $this->limitLength)
             ->field($field)
             ->order('id desc')
-            ->select()->toArray();
+            ->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;
+            })
+            ->toArray();
 
         foreach ($lists as &$item) {
             $item['channel'] = UserTerminalEnum::getTermInalDesc($item['channel']);
diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php
index fca1757bb..ed981af02 100755
--- a/app/common/model/user/User.php
+++ b/app/common/model/user/User.php
@@ -22,6 +22,7 @@ use app\common\model\BaseModel;
 use app\common\service\FileService;
 use think\model\concern\SoftDelete;
 use app\common\model\Company;
+use app\common\model\contract\Contract;
 use think\facade\Db;
 /**
  * 用户模型
@@ -183,7 +184,6 @@ class User extends BaseModel
     {
         return $this->hasOne(Company::class, 'id', 'company_id')->field(['id','company_name','admin_id']);
     }
-
     public function getCityNameAttr($value)
     {
         return Db::name('geo_city')->where(['city_code' => $this->city])->value('city_name');