From 40713972f59e9e54effe1fbeff2f16fedd0693ae Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 26 Jun 2023 15:38:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=A1=E5=AF=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/other/export/ExportServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/other/export/ExportServices.php b/crmeb/app/services/other/export/ExportServices.php
index b522c5785..7a37dc2b5 100644
--- a/crmeb/app/services/other/export/ExportServices.php
+++ b/crmeb/app/services/other/export/ExportServices.php
@@ -358,7 +358,7 @@ class ExportServices extends BaseServices
                 $one_data = [
                     'card_number' => $item['card_number'],
                     'card_password' => $item['card_password'],
-                    'user_name' => $userList[$item['use_uid']]['real_name'] ?: $userList[$item['use_uid']]['nickname'],
+                    'user_name' => $userList[$item['use_uid']]['real_name'] ?? $userList[$item['use_uid']]['nickname'] ?? '',
                     'user_phone' => $userList[$item['use_uid']] ? $userList[$item['use_uid']]['phone'] : "",
                     'use_time' => $item['use_time'],
                     'use_uid' => $item['use_uid'] ? '已领取' : '未领取'

From 8e470e2f20dec4ca189c914399194d41cb576554 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 26 Jun 2023 15:39:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=A1=E5=AF=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/other/export/ExportServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/other/export/ExportServices.php b/crmeb/app/services/other/export/ExportServices.php
index 7a37dc2b5..40be3b78a 100644
--- a/crmeb/app/services/other/export/ExportServices.php
+++ b/crmeb/app/services/other/export/ExportServices.php
@@ -359,7 +359,7 @@ class ExportServices extends BaseServices
                     'card_number' => $item['card_number'],
                     'card_password' => $item['card_password'],
                     'user_name' => $userList[$item['use_uid']]['real_name'] ?? $userList[$item['use_uid']]['nickname'] ?? '',
-                    'user_phone' => $userList[$item['use_uid']] ? $userList[$item['use_uid']]['phone'] : "",
+                    'user_phone' => $userList[$item['use_uid']] ?? $userList[$item['use_uid']]['phone'] ?? "",
                     'use_time' => $item['use_time'],
                     'use_uid' => $item['use_uid'] ? '已领取' : '未领取'
                 ];

From d4c6506b53c7698f28f1475c99f297410f9dfdc2 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 26 Jun 2023 15:40:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=A1=E5=AF=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/other/export/ExportServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/other/export/ExportServices.php b/crmeb/app/services/other/export/ExportServices.php
index 40be3b78a..ad402dae2 100644
--- a/crmeb/app/services/other/export/ExportServices.php
+++ b/crmeb/app/services/other/export/ExportServices.php
@@ -359,7 +359,7 @@ class ExportServices extends BaseServices
                     'card_number' => $item['card_number'],
                     'card_password' => $item['card_password'],
                     'user_name' => $userList[$item['use_uid']]['real_name'] ?? $userList[$item['use_uid']]['nickname'] ?? '',
-                    'user_phone' => $userList[$item['use_uid']] ?? $userList[$item['use_uid']]['phone'] ?? "",
+                    'user_phone' => $userList[$item['use_uid']]['phone'] ?? "",
                     'use_time' => $item['use_time'],
                     'use_uid' => $item['use_uid'] ? '已领取' : '未领取'
                 ];