Merge branch 'feature/export_authority' of wmtx/platform into release

游戏统计导出修改

Application/Admin/Controller/ExportController.class.php

@@ -8059,6 +8059,7 @@ class ExportController extends Controller
             array('balance_coin_count','平台币直充支出'),
             array('inside_cash_count','内充支出'),
             array('all_cash_count','游戏内充值合计'),
+            array('notice_fail_count','通知失败合计'),
         );
 
         $map = [];
@@ -8104,13 +8105,15 @@ class ExportController extends Controller
         $sumCash = $totalData['cash_count'];
         $sumBalance = $totalData['balance_coin_count'];
         $sumInside = $totalData['inside_cash_count'];
+        $sumNoticeFail = $totalData['notice_fail_count']? $totalData['notice_fail_count']:0;
         $sumAll = $sumCash + $sumBalance + $sumInside;
 
         $sumData = [['game_name'=>'总计',
             'cash_count'=>$sumCash,
             'balance_coin_count'=>$sumBalance,
             'inside_cash_count'=>$sumInside,
-            'all_cash_count'=>$sumAll]];
+            'all_cash_count'=>$sumAll,
+            'notice_fail_count'=>$sumNoticeFail]];
         $xlsData = array_merge($xlsData,$sumData);
         $this->exportAddOperationLog("Finance/gameStatistics","充值-财务管理-游戏统计-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);

Application/Admin/Controller/UserActionLogController.class.php

@@ -68,7 +68,7 @@ class UserActionLogController extends AdminController
                 $data[$key]['action_title'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
             } else if ($value['type'] == 0) {
                $data[$key]['action_title'] = '修改密码';
-               if ($action['account']) {
+               if (!$action['old_data']) {
                    $data[$key]['action_content'] = "-------------------";
                } else {
                    $data[$key]['action_content'] = "旧值：{$action['old_data']}<br>新值：{$action['new_data']}";

Application/Admin/View/Finance/gameStatistics.html

@@ -240,7 +240,7 @@
             <td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
             <td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>
             <td><if condition="$sumAll neq ''">{$sumAll}<else/>0</if></td>
-            <td><span style="color: red"><if condition="$sumAll neq ''">{$sumNoticeFail}<else/>0</if></span></td>
+            <td><span style="color: red"><if condition="$sumNoticeFail neq ''">{$sumNoticeFail}<else/>0</if></span></td>
             <td>
               <a href="{:U('Finance/gameStatisticsDetail',
                 array(