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

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

Browse Source 
Merge Request: feature: salary auth

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/101
This commit is contained in:
zhuyu 2025-06-03 22:56:38 +08:00 committed by Coding
commit f1af5c7930
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/oa/Schedule.php
View File

@ -117,7 +117,7 @@ class Schedule extends Backend
$res[$adminId][$tmpDate] = '无'; $res[$adminId][$tmpDate] = '无';
$res[$adminId]['admin_id'] = $adminId; $res[$adminId]['admin_id'] = $adminId;
$res[$adminId]['name'] = $adminNames[$adminId]; $res[$adminId]['name'] = $adminNames[$adminId];
$res[$adminId]['editable'] = $this->auth->check('oa/schedule/custom_manage') ? 1 : 0; $res[$adminId]['editable'] = $this->auth->check('oa/schedule/custom_edit') ? 1 : 0;
} }
$dates[] = $tmpDate; $dates[] = $tmpDate;

2
application/admin/controller/salary/Detail.php
View File

@ -154,7 +154,7 @@ class Detail extends Backend
return json($result); return json($result);
} }
$this->assignconfig("manage", $this->auth->check('salary/detail/custom_manage')); $this->assignconfig("manage", $this->auth->check('salary/detail/custom_edit'));
$this->view->assign("month", $month); $this->view->assign("month", $month);
$this->view->assign("salaryitem", json_encode($salaryItem)); $this->view->assign("salaryitem", json_encode($salaryItem));
return $this->view->fetch(); return $this->view->fetch();