1

app/adminapi/lists/asset/AssetAreaLists.php

@@ -63,8 +63,6 @@ class AssetAreaLists extends BaseAdminDataLists implements ListsSearchInterface
             ->select()
             ->toArray();
 
-
-
         if($this->params['is_tree'] ==1){
 
 

app/api/logic/ServiceLogic.php

@@ -315,7 +315,8 @@ class ServiceLogic extends BaseLogic
 
     public static function getUserServiceInfo($user_id){
         $info = User::field('id,nickname,mobile,agricultural_status,agricultural_id,bake_status,bake_id,air_status,air_id')
-            ->find($user_id)->toArray();
+            ->with(['agricultural','bake','air'])->find($user_id)->toArray();
+
         return $info;
     }
 }

app/common/model/user/User.php

@@ -19,6 +19,7 @@ namespace app\common\model\user;
 use app\common\enum\user\UserEnum;
 use app\common\model\BaseModel;
 use app\common\service\FileService;
+use app\common\model\recharge\RechargeOrder;
 use think\model\concern\SoftDelete;
 
 /**
@@ -44,6 +45,23 @@ class User extends BaseModel
         return $this->hasOne(UserAuth::class, 'user_id');
     }
 
+    public function agricultural()
+    {
+        return $this->hasOne(RechargeOrder::class, 'id', 'agricultural_id')
+            ->field('*');
+    }
+
+    public function bake()
+    {
+        return $this->hasOne(RechargeOrder::class, 'id', 'bake_id')
+            ->field('*');
+    }
+
+    public function air()
+    {
+        return $this->hasOne(RechargeOrder::class, 'id', 'air_id')
+            ->field('*');
+    }
 
     /**
      * @notes 搜索器-用户信息