diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php index 16f46ca..97c88c6 100755 --- a/application/admin/controller/auth/Admin.php +++ b/application/admin/controller/auth/Admin.php @@ -358,4 +358,11 @@ class Admin extends Backend } $this->success(); } + + public function norightselectpage() + { + $this->dataLimit = ''; + $this->dataLimitField = ''; + return parent::selectpage(); + } } diff --git a/application/admin/controller/salary/CustomDetail.php b/application/admin/controller/salary/CustomDetail.php index 27207d2..2f404a5 100644 --- a/application/admin/controller/salary/CustomDetail.php +++ b/application/admin/controller/salary/CustomDetail.php @@ -91,7 +91,7 @@ class CustomDetail extends Backend $builder = $this->model ->where('salary_month', '=', $month); - if (!$this->auth->isSuperAdmin()) { + if (!$this->auth->check('salary/custom_detail/edit')) { $builder = $builder->where('target_admin_id', $this->auth->id); } diff --git a/application/admin/view/oa/custom_schedule/add.html b/application/admin/view/oa/custom_schedule/add.html index cd4d268..2f2fe7d 100644 --- a/application/admin/view/oa/custom_schedule/add.html +++ b/application/admin/view/oa/custom_schedule/add.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/oa/custom_schedule/edit.html b/application/admin/view/oa/custom_schedule/edit.html index 1634edf..fbf8f3e 100644 --- a/application/admin/view/oa/custom_schedule/edit.html +++ b/application/admin/view/oa/custom_schedule/edit.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/salary/custom_detail/add.html b/application/admin/view/salary/custom_detail/add.html index 25e6326..a74728d 100644 --- a/application/admin/view/salary/custom_detail/add.html +++ b/application/admin/view/salary/custom_detail/add.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/salary/custom_detail/edit.html b/application/admin/view/salary/custom_detail/edit.html index 5a2ad7b..e8f3f68 100644 --- a/application/admin/view/salary/custom_detail/edit.html +++ b/application/admin/view/salary/custom_detail/edit.html @@ -3,7 +3,7 @@
- +