hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #180: (feature/zy -> develop)

Browse Source 
Merge Request: feature: 排班表

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/180
This commit is contained in:
zhuyu 2025-06-25 11:09:37 +08:00 committed by Coding
commit 472fa82ecc
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/admin/controller/auth/Admin.php
View File

@ -375,7 +375,6 @@ class Admin extends Backend
public function norightselectpage() public function norightselectpage()
{ {
$this->dataLimit = null;
return parent::selectpage(); return parent::selectpage();
} }
} }

3
application/admin/controller/auth/Group.php
View File

@ -27,7 +27,7 @@ class Group extends Backend
protected $grouplist = []; protected $grouplist = [];
protected $groupdata = []; protected $groupdata = [];
//无需要权限判断的方法 //无需要权限判断的方法
protected $noNeedRight = ['roletree']; protected $noNeedRight = ['roletree', 'norightselectpage'];
public function _initialize() public function _initialize()
{ {
@ -84,7 +84,6 @@ class Group extends Backend
public function norightselectpage() public function norightselectpage()
{ {
$this->dataLimit = null;
return parent::selectpage(); return parent::selectpage();
} }

4
application/admin/controller/oa/CustomSchedule.php
View File

@ -108,6 +108,10 @@ class CustomSchedule extends Backend
foreach ($queryData as $queryDatum) { foreach ($queryData as $queryDatum) {
$queryDatum = $queryDatum->toArray(); $queryDatum = $queryDatum->toArray();
if (empty($queryDatum['admin']['id'])) {
continue;
}
$adminId = $queryDatum['admin']['id']; $adminId = $queryDatum['admin']['id'];
$date = $queryDatum['date']; $date = $queryDatum['date'];
$type = $queryDatum['type']; $type = $queryDatum['type'];