Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev

5 years ago · 7ec754e0eb
parent a5cc0f339f e6c45bc494
commit 7ec754e0eb
1 changed files with 1 additions and 1 deletions
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@ -5622,7 +5622,7 @@ if ($key == 'model'){
 				$map['tab_user.account']=array('like','%'.$_REQUEST['account'].'%');
 				unset($_REQUEST['account']);
 			}
-
+            $map['register_type'] = array('in','(0,1,2,3,4,5,6,7)');
            $csvFileName = $xlsName.'.csv';
            //设置好告诉浏览器要下载excel文件的headers
            header('Content-Description: File Transfer');