app/Admin/Services/HolidayApplyService.php

@@ -81,8 +81,8 @@ class HolidayApplyService extends BaseService
             'employee_id' => ['required'],
             'type_id' => ['required'],
             'reason' => ['required'],
-            'start_at' => ['required', 'date'],
+            'start_at' => ['required'],
-            'end_at' => ['required', 'date'],
+            'end_at' => ['required'],
         ];
         $updateRules = [];
         $validator = Validator::make($data, $model ? $updateRules : $createRules, []);

app/Admin/Services/OvertimeApplyService.php

@@ -86,9 +86,9 @@ class OvertimeApplyService extends BaseService
         // todo 验证申请时间是否重复
         $createRules = [
             'employee_id' => ['required'],
-            'date' => ['required', 'date'],
+            'date' => ['required'],
-            'start_at' => ['required', 'date'],
+            'start_at' => ['required'],
-            'end_at' => ['required', 'date'],
+            'end_at' => ['required'],
         ];
         $updateRules = [];
         $validator = Validator::make($data, $model ? $updateRules : $createRules, []);

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::Admin, $role)) {
+        if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) {
-            $list = $query->get();
+            $list = [Store::findOrFail($user->store_id)];
-        } else if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) {
+        } else if (in_array(UserRole::Admin, $role)) {
-            $list = [$query->findOrFail($user->store_id)];
+            $list = Store::get();
-        } 
+        }
 
         return StoreResource::collection($list);
     }

app/Http/Controllers/Api/ReimbursementController.php

@@ -23,12 +23,13 @@ class ReimbursementController extends Controller
         $user = $request->user();
 
         $reimbursements = $user->reimbursements()
-            ->with(['type', 'workflow'])
             ->filter($request->input())
-            ->sort('created_at', 'desc')
+            ->sort('id')
-            ->paginate($request->input('per_page', 20));
+            ->simplePaginate($request->input('per_page', 20));
 
-        return ReimbursementResource::collection($reimbursements);
+        return ReimbursementResource::collection(
+            $reimbursements->loadMissing(['type', 'workflow']),
+        );
     }
 
     public function store(Request $request, WorkFlowService $workFlowService): ReimbursementResource

app/Http/Controllers/Api/WorkflowController.php

@@ -40,14 +40,14 @@ class WorkflowController extends Controller
 
         $list = $query->paginate($request->input('per_page'));
 
-        // switch ($model) {
+        switch ($model) {
-        //     case TaskHygiene::class:
+            case TaskHygiene::class:
-        //         $list->loadMissing(['task', 'store']);
+                $list->loadMissing(['task', 'store']);
-        //         $list->through(function (TaskHygiene $item) {
+                $list->through(function (TaskHygiene $item) {
-        //             return tap($item->task)->setRelation('taskable', $item->unsetRelation('task'));
+                    return tap($item->task)->setRelation('taskable', $item->unsetRelation('task'));
-        //         });
+                });
-        //         break;
+                break;
-        // }
+        }
 
         return $resource::collection($list);
     }