管理后台导出数据bug修正

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'] = "暂无";
                         }