From dee66b9ef18ae6e86b3a2c4177cb49d55d5cb74c Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 24 Apr 2024 19:47:26 +0800
Subject: [PATCH] ls

---
 app/Admin/Services/HolidayApplyService.php       |  4 ++--
 app/Admin/Services/OvertimeApplyService.php      |  6 +++---
 app/Http/Controllers/Api/Auth/UserController.php | 10 +++++-----
 .../Controllers/Api/ReimbursementController.php  |  9 ++++-----
 app/Http/Controllers/Api/WorkflowController.php  | 16 ++++++++--------
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/Admin/Services/HolidayApplyService.php b/app/Admin/Services/HolidayApplyService.php
index 50fccf0..c902284 100644
--- a/app/Admin/Services/HolidayApplyService.php
+++ b/app/Admin/Services/HolidayApplyService.php
@@ -81,8 +81,8 @@ class HolidayApplyService extends BaseService
             'employee_id' => ['required'],
             'type_id' => ['required'],
             'reason' => ['required'],
-            'start_at' => ['required'],
-            'end_at' => ['required'],
+            'start_at' => ['required', 'date'],
+            'end_at' => ['required', 'date'],
         ];
         $updateRules = [];
         $validator = Validator::make($data, $model ? $updateRules : $createRules, []);
diff --git a/app/Admin/Services/OvertimeApplyService.php b/app/Admin/Services/OvertimeApplyService.php
index f023f22..ef0142c 100644
--- a/app/Admin/Services/OvertimeApplyService.php
+++ b/app/Admin/Services/OvertimeApplyService.php
@@ -86,9 +86,9 @@ class OvertimeApplyService extends BaseService
         // todo 验证申请时间是否重复
         $createRules = [
             'employee_id' => ['required'],
-            'date' => ['required'],
-            'start_at' => ['required'],
-            'end_at' => ['required'],
+            'date' => ['required', 'date'],
+            'start_at' => ['required', 'date'],
+            'end_at' => ['required', 'date'],
         ];
         $updateRules = [];
         $validator = Validator::make($data, $model ? $updateRules : $createRules, []);
diff --git a/app/Http/Controllers/Api/Auth/UserController.php b/app/Http/Controllers/Api/Auth/UserController.php
index bf1293e..3978d65 100644
--- a/app/Http/Controllers/Api/Auth/UserController.php
+++ b/app/Http/Controllers/Api/Auth/UserController.php
@@ -67,11 +67,11 @@ class UserController extends Controller
         $role = $user->userRole();
         $list = [];
         $query = Store::filter($request->all())->where('business_status', BusinessStatus::Open);
-        if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) {
-            $list = [Store::findOrFail($user->store_id)];
-        } else if (in_array(UserRole::Admin, $role)) {
-            $list = Store::get();
-        }
+        if (in_array(UserRole::Admin, $role)) {
+            $list = $query->get();
+        } else if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) {
+            $list = [$query->findOrFail($user->store_id)];
+        } 
 
         return StoreResource::collection($list);
     }
diff --git a/app/Http/Controllers/Api/ReimbursementController.php b/app/Http/Controllers/Api/ReimbursementController.php
index 9575357..06c3e60 100644
--- a/app/Http/Controllers/Api/ReimbursementController.php
+++ b/app/Http/Controllers/Api/ReimbursementController.php
@@ -23,13 +23,12 @@ class ReimbursementController extends Controller
         $user = $request->user();
 
         $reimbursements = $user->reimbursements()
+            ->with(['type', 'workflow'])
             ->filter($request->input())
-            ->sort('id')
-            ->simplePaginate($request->input('per_page', 20));
+            ->sort('created_at', 'desc')
+            ->paginate($request->input('per_page', 20));
 
-        return ReimbursementResource::collection(
-            $reimbursements->loadMissing(['type', 'workflow']),
-        );
+        return ReimbursementResource::collection($reimbursements);
     }
 
     public function store(Request $request, WorkFlowService $workFlowService): ReimbursementResource
diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php
index 80a5ef0..fb3e384 100644
--- a/app/Http/Controllers/Api/WorkflowController.php
+++ b/app/Http/Controllers/Api/WorkflowController.php
@@ -40,14 +40,14 @@ class WorkflowController extends Controller
 
         $list = $query->paginate($request->input('per_page'));
 
-        switch ($model) {
-            case TaskHygiene::class:
-                $list->loadMissing(['task', 'store']);
-                $list->through(function (TaskHygiene $item) {
-                    return tap($item->task)->setRelation('taskable', $item->unsetRelation('task'));
-                });
-                break;
-        }
+        // switch ($model) {
+        //     case TaskHygiene::class:
+        //         $list->loadMissing(['task', 'store']);
+        //         $list->through(function (TaskHygiene $item) {
+        //             return tap($item->task)->setRelation('taskable', $item->unsetRelation('task'));
+        //         });
+        //         break;
+        // }
 
         return $resource::collection($list);
     }