From 30b3794ef4ed4f29e83bae94647752f448b4d67b Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 5 Dec 2019 14:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AEbug=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ExportController.class.php     | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 42bdcbd22..7e50f2a51 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -5097,7 +5097,7 @@ if ($key == 'model'){
 				$model = M('Promote','tab_');
 
 				if(isset($_REQUEST['promote_id'])){
-            $map['id']=$_REQUEST['promote_id'];
+            $map['tab_promote.id']=$_REQUEST['promote_id'];
         }
         if(isset($_REQUEST['admin_id'])){
             if($_REQUEST['admin_id']=="全部"){
@@ -5115,7 +5115,7 @@ if ($key == 'model'){
             }else{
                 $zid=$_REQUEST['parent_id'];
             }
-            $map['id']=array('in',$zid);
+            $map['tab_promote.id']=array('in',$zid);
         }
                 if (I("promote_level")) {
                     $map['level'] = I("promote_level");
@@ -5123,7 +5123,21 @@ if ($key == 'model'){
         if(I('oa_associated',-1) != -1) {
             $map['oa_associated'] = I('oa_associated');
         }
-			}
+
+        if (I("ver_status")) {
+            $map['ver_status'] = I("ver_status");
+        }
+
+                if (I("ver_status")) {
+                    $map['tab_promote.ver_status'] = I("ver_status");
+                }
+
+                if (I('status')) {
+                    $map['tab_promote.status'] = I('status');
+                }
+
+
+            }
 
 
 
@@ -5178,8 +5192,8 @@ if ($key == 'model'){
 
 					foreach($xlsData as $k => &$v) {
 
-						$v['create_time'] = $v['create_time']?date('Y-m-d H:i',$v['create_time']):0;
-						$v['last_login_time'] = $v['last_login_time']?date('Y-m-d H:i',$v['last_login_time']):0;
+						$v['create_time'] = $v['create_time']?date('Y-m-d H:i',$v['create_time']):'';
+						$v['last_login_time'] = $v['last_login_time']?date('Y-m-d H:i',$v['last_login_time']):'暂无登录';
                         if (!$v['business_affairs']) {
                             $v['business_affairs'] = "暂无";
                         }