From 90b85bc40ad24920404e3b2dd5cb84f3dd4e5e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 20 Nov 2025 15:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=9A=E5=8F=8B=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/User.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/application/api/model/User.php b/application/api/model/User.php
index 6feae87..ea1f4a9 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -970,10 +970,9 @@ class User extends Model
         //获取用户当前所拥有的关系
         $relation = db::name('vs_relation')->where(['id' => ['>',0],'delete_time' => 0])->page($page,$limit)->select();
         $return_data = [];
-        if(!$relation){
+        if($relation){
             foreach ($relation as $v){
                 $return_data['no_cp']['relation_name'] = $v['name'];
-//                $return_data['no_cp']['relation_image'] = $v['icon'];
                 $return_data['no_cp']['relation_list'] = $this->relation_card($v['id'],$user_id);
             }
         }
@@ -989,12 +988,10 @@ class User extends Model
         }
         if($res){
             $return_data['cp']['relation_name'] = 'CP';
-//            $return_data['cp']['relation_image'] = '';
-            $return_data['cp']['relation_list'][] = $res;
+            $return_data['cp']['relation_list'] = $res;
         }else{
             $return_data['cp']['relation_name'] = 'CP';
-//            $return_data['cp']['relation_image'] = '';
-            $return_data['cp']['relation_list'][] = '';
+            $return_data['cp']['relation_list'] = '';
         }
 
         return ['code' => 1, 'msg' => '获取成功', 'data' => $return_data];