From 8088787eeee0f0f821a6c2f08ecf6c5185cb562c Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Tue, 16 May 2023 08:13:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=AA=8C=E8=AF=81=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../User/Http/Controllers/UserController.php  | 11 ++---
 modules/User/Http/Requests/UserRequest.php    | 44 +++++++++++++++++++
 2 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 modules/User/Http/Requests/UserRequest.php

diff --git a/modules/User/Http/Controllers/UserController.php b/modules/User/Http/Controllers/UserController.php
index b07c59e..7486516 100644
--- a/modules/User/Http/Controllers/UserController.php
+++ b/modules/User/Http/Controllers/UserController.php
@@ -6,13 +6,14 @@ use Catch\Base\CatchController as Controller;
 use Catch\Support\Module\ModuleRepository;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
-use Illuminate\Http\Request;
 use Modules\Permissions\Models\Departments;
 use Modules\User\Models\LogLogin;
 use Modules\User\Models\LogOperate;
 use Modules\User\Models\User;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use Modules\User\Http\Requests\UserRequest;
+use Illuminate\Http\Request;
 
 class UserController extends Controller
 {
@@ -47,10 +48,10 @@ class UserController extends Controller
     /**
      * store
      *
-     * @param Request $request
+     * @param UserRequest $request
      * @return false|mixed
      */
-    public function store(Request $request)
+    public function store(UserRequest $request)
     {
         return $this->user->storeBy($request->all());
     }
@@ -80,10 +81,10 @@ class UserController extends Controller
      * update
      *
      * @param $id
-     * @param Request $request
+     * @param UserRequest $request
      * @return mixed
      */
-    public function update($id, Request $request)
+    public function update($id, UserRequest $request)
     {
         return $this->user->updateBy($id, $request->all());
     }
diff --git a/modules/User/Http/Requests/UserRequest.php b/modules/User/Http/Requests/UserRequest.php
new file mode 100644
index 0000000..b1ca7f6
--- /dev/null
+++ b/modules/User/Http/Requests/UserRequest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Modules\User\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Modules\Permissions\Models\Roles;
+
+class UserRequest extends FormRequest
+{
+    /**
+     * rules
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => [
+              'required',
+               Rule::unique('users')->where(function ($query) {
+                   return $query->when($this->get('id'), function ($query){
+                       $query->where('id', '<>', $this->get('id'));
+                   })->where('deleted_at', 0);
+               })
+            ],
+        ];
+    }
+
+
+    /**
+     * messages
+     *
+     * @return string[]
+     */
+    public function messages(): array
+    {
+        return [
+            'email.required' => '邮箱必须填写',
+
+            'email.unique' => '邮箱已存在',
+        ];
+    }
+}