From e38cfbabf970a98572c53749c256d089ef4c5874 Mon Sep 17 00:00:00 2001
From: Hjj <126586545@qq.com>
Date: Wed, 2 Jul 2025 17:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=AE=BF=E8=AE=B0=E5=BD=95=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=9B=B4=E8=AF=A6=E7=BB=86=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/UserFollowRecordController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/UserFollowRecordController.php b/app/Admin/Controllers/UserFollowRecordController.php
index c02094b..71f02b9 100644
--- a/app/Admin/Controllers/UserFollowRecordController.php
+++ b/app/Admin/Controllers/UserFollowRecordController.php
@@ -6,6 +6,7 @@ use App\Admin\Actions\Form\Follow\EditEnrollStatusForm;
 use App\Admin\Actions\Form\Follow\FollowRecordForm;
 use App\Models\AdminFollowShow;
 use App\Models\AdmissionNewStudents;
+use App\Models\DcatAdminUsers;
 use App\Models\SecondaryCollege;
 use App\Models\Speciality;
 use App\Models\UserFollowRecord;
@@ -76,13 +77,16 @@ class UserFollowRecordController extends AdminController
             $grid->column('followRecordHasOne.follow_id', "回访状态")->display(function ($val) {
                 return (int)$val;
             })->using($followList)->expand(function () use ($followList) {
-                $titles = ['ID', '回访状态', '回访状态', '回访时间', '用户ID'];
+                $titles = ['ID', '回访状态', '回访状态', '回访时间', '用户ID', '用户名', '用户昵称'];
                 $data = UserFollowRecord::query()
                     ->where(['unique_number' => $this['unique_number']])
                     ->orderByDesc('id')
                     ->get(['id', 'follow_id', 'theme', 'follow_time', 'user_id'])
                     ->map(function ($val) use ($followList) {
                         $val->follow_id = $followList[$val->follow_id] ?? '';
+                        $info = DcatAdminUsers::query()->find($val->user_id);
+                        $val->username = $info['username']??'';
+                        $val->name = $info['name']??'';
                         return $val;
                     })
                     ->toArray();