moonsflyer 9 mēneši atpakaļ
vecāks
revīzija
7b261934fb

+ 3 - 2
app/adminapi/lists/asset/AssetLeaseLists.php

@@ -123,8 +123,8 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
         }
         $lists = (new AssetLeaseInfo())->field('*')
             ->append(['first_status_desc','second_status_desc','approval_status_desc'])
-            ->with('asset')
-            ->with('referee')
+//            ->with('referee')
+            ->with(['asset','referee'])
             ->where($where)
             ->where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
@@ -137,6 +137,7 @@ class AssetLeaseLists extends BaseAdminDataLists implements ListsSearchInterface
             $v['first_name'] = adminModel::where(['id'=>$v['first_uid']])->value('name') ?? '';
             $v['second_name'] = adminModel::where(['id'=>$v['second_uid']])->value('name') ?? '' ;
         }
+
         return $lists;
     }
 

+ 2 - 1
app/common/model/asset/AssetLeaseInfo.php

@@ -18,6 +18,7 @@ namespace app\common\model\asset;
 use app\common\enum\DefaultEnum;
 use app\common\enum\asset\AssetEnum;
 use app\common\model\auth\Admin;
+use app\common\model\asset\AssetInfo;
 use app\common\model\BaseModel;
 use think\model\concern\SoftDelete;
 
@@ -36,7 +37,7 @@ class AssetLeaseInfo extends BaseModel
     public function asset()
     {
         return $this->hasOne(AssetInfo::class, 'id', 'a_id')
-            ->field('id,name,images,address,address,mobile,area');
+            ->field('id,name,images,address,contacts,mobile,area');
     }
     /**
      * @notes 关联管理员表