diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php index af1cc94..0cc1558 100755 --- a/application/admin/controller/auth/Admin.php +++ b/application/admin/controller/auth/Admin.php @@ -375,7 +375,6 @@ class Admin extends Backend public function norightselectpage() { - $this->dataLimit = null; return parent::selectpage(); } } diff --git a/application/admin/controller/auth/Group.php b/application/admin/controller/auth/Group.php index c4626f6..99f1af1 100755 --- a/application/admin/controller/auth/Group.php +++ b/application/admin/controller/auth/Group.php @@ -27,7 +27,7 @@ class Group extends Backend protected $grouplist = []; protected $groupdata = []; //无需要权限判断的方法 - protected $noNeedRight = ['roletree']; + protected $noNeedRight = ['roletree', 'norightselectpage']; public function _initialize() { @@ -84,7 +84,6 @@ class Group extends Backend public function norightselectpage() { - $this->dataLimit = null; return parent::selectpage(); } diff --git a/application/admin/controller/oa/CustomSchedule.php b/application/admin/controller/oa/CustomSchedule.php index 666b874..aa90920 100644 --- a/application/admin/controller/oa/CustomSchedule.php +++ b/application/admin/controller/oa/CustomSchedule.php @@ -108,6 +108,10 @@ class CustomSchedule extends Backend foreach ($queryData as $queryDatum) { $queryDatum = $queryDatum->toArray(); + if (empty($queryDatum['admin']['id'])) { + continue; + } + $adminId = $queryDatum['admin']['id']; $date = $queryDatum['date']; $type = $queryDatum['type'];