From 4d938b85f42f181bb3feb1ee5db883ad08f79fc5 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 20 Apr 2020 14:53:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=B4=A6=E5=8F=B7=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/function.php                   | 3 ++-
 Application/Admin/Controller/ExportController.class.php | 3 ++-
 Data/update.sql                                         | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php
index 3c2e35ddc..c99363bfd 100644
--- a/Application/Admin/Common/function.php
+++ b/Application/Admin/Common/function.php
@@ -953,7 +953,8 @@ function checkEncryptionAuth(&$value,$string){
     }else{
         $exportRule  = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.$string."_encryption_check");
 
-        if (checkRule($exportRule,array('in','1,2'))) {
+        if (!checkRule($exportRule,array('in','1,2'))) {
+//            dump(1);die();
             $value = encryption($value);
         }
 
diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index f2cc2dafe..8b8cf039e 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -2645,6 +2645,7 @@ class ExportController extends Controller
                                     $allDatas['spend_amount'] = $spend;
                                     $allDatas['deposit_amount'] = $deposit;
                                     $allDatas['coin_amount'] = $promoteCoin;
+                                    checkEncryptionAuth($allDatas['user_account'],'valueDetail');
                                     mb_convert_variables('GBK', 'UTF-8', $allDatas);
                                     fputcsv($fp, $allDatas);
                                 }  
@@ -4151,7 +4152,7 @@ class ExportController extends Controller
         $xlsName = $_REQUEST['xlsname'];
         $data = $data['data'];
         foreach ($data as $key => $value) {
-            checkEncryptionAuth($data[$key]['user_account'],'deposit_lists');
+            checkEncryptionAuth($data[$key]['user_account'],'BindRechargeRecordExport');
             $data[$key]['pay_way'] = get_pay_way($value['pay_way']);
             $data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']);
             if ($value['pay_status'] == 1) {
diff --git a/Data/update.sql b/Data/update.sql
index d0563deee..5cb10473f 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1567,3 +1567,6 @@ CREATE TABLE `tab_finance_compare_info` (
   KEY `pay_way` (`pay_way`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='财务导入对账详情表';
 
+--新增财务导入对账详情表 zyx 20200420
+ALTER TABLE `platform`.`sys_auth_rule`
+MODIFY COLUMN `title` varchar(80) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '规则中文描述' AFTER `name`;
\ No newline at end of file