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

导出bug修改
5 years ago · c5f9a25a9e
parent 4a472f2a6a ee9f53ce0b
commit c5f9a25a9e
1 changed files with 6 additions and 0 deletions
--- a/Application/Admin/Controller/AdminController.class.php
+++ b/Application/Admin/Controller/AdminController.class.php
@ -651,6 +651,7 @@ class AdminController extends Controller {

            $countRule  = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME."_count_check");  
            $this->assign($countfield,$this->checkRule($countRule,array('in','1,2')));
+
            //验证list
            $listrule  = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME."_list_check");  
            $listflag  = $this->checkRule($listrule,array('in','1,2'));
@ -665,6 +666,11 @@ class AdminController extends Controller {
                    };
                }
            }
+
+            if (is_array($checkarr)&&!$checkarr) {
+                return;
+            }
+
            if(!$listflag){
                $map["_string"] = "1=0";
            }