From bea34c6800c32c79f24accce33a43d0a8dfaacd4 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Mon, 11 Sep 2023 18:54:36 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E4=BD=99=E9=A2=9D=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/finance/AccountLogLists.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/lists/finance/AccountLogLists.php b/app/adminapi/lists/finance/AccountLogLists.php
index 4cacfc010..e5fa0c308 100755
--- a/app/adminapi/lists/finance/AccountLogLists.php
+++ b/app/adminapi/lists/finance/AccountLogLists.php
@@ -40,11 +40,11 @@ class AccountLogLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setExcelFields(): array
     {
         return [
-            'user_info.sn' => '用户编号',
-            'company_info.company_name' => '归属公司',
-            'user_info.nickname' => '用户昵称',
-            'user_info.group_name' => '角色名称',
-            'user_info.mobile' => '手机号码',
+            'user_info_sn' => '用户编号',
+            'company_info_company_name' => '归属公司',
+            'user_info_nickname' => '用户昵称',
+            'user_info_group_name' => '角色名称',
+            'user_info_mobile' => '手机号码',
             'change_amount' => '变动金额',
             'left_amount' => '剩余金额',
             'change_type_desc' => '变动类型',
@@ -123,6 +123,12 @@ class AccountLogLists extends BaseAdminDataLists implements ListsSearchInterface
             $item['change_type_desc'] = AccountLogEnum::getChangeTypeDesc($item['change_type']);
             $symbol = $item['action'] == AccountLogEnum::INC ? '+' : '-';
             $item['change_amount'] = $symbol . $item['change_amount'];
+            // 用于导出
+            $item['user_info_sn'] = $item['user_info']['sn'];
+            $item['company_info_company_name'] = $item['company_info']['company_name'];
+            $item['user_info_nickname'] = $item['user_info']['nickname'];
+            $item['user_info_group_name'] = $item['user_info']['group_name'];
+            $item['user_info_mobile'] = $item['user_info']['mobile'];
         }
 
         return $lists;