1

app/data/controller/api/auth/Center.php

@@ -52,8 +52,6 @@ class Center extends Auth
     public function get()
     {
         $user = $this->getUser();
-        $merchants = DataMerchants::mk()->where('uuid',$this->uuid)->find();
-        $user['merchants'] = $merchants;
         $this->success('获取用户资料', $user);
     }
 

app/data/model/DataUser.php

@@ -41,4 +41,7 @@ class DataUser extends Model
     public function shipyard(){
         return $this->hasOne(DataShipyard::class,'uuid');
     }
+    public function merchants(){
+        return $this->hasOne(DataMerchants::class,'uuid');
+    }
 }

app/data/service/UserAdminService.php

@@ -85,7 +85,7 @@ class UserAdminService extends Service
         $map = ['id' => $uuid, 'deleted' => 0];
         $user = DataUser::mk()
             ->where($map)
-            ->with(['pooltalent','maintenance','shipyard'])
+            ->with(['pooltalent','maintenance','shipyard','merchants'])
             ->findOrEmpty();
         if ($user->isEmpty()) throw new Exception('用户还没有注册！');
         // 用户认证令牌处理