From 2690fff54b221ea22a2525265f5cb62faee75b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=AF=E7=88=B1=E7=8E=A9=E5=85=B7=E7=86=8A?=
 <978713427@qq.com>
Date: Fri, 22 Nov 2024 13:33:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8F=B7=E7=9A=84=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/validate/system/SystemUserValidate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin/validate/system/SystemUserValidate.php b/app/admin/validate/system/SystemUserValidate.php
index cc9913c..d468195 100644
--- a/app/admin/validate/system/SystemUserValidate.php
+++ b/app/admin/validate/system/SystemUserValidate.php
@@ -21,7 +21,7 @@ class SystemUserValidate extends Validate
      * 定义验证规则
      */
     protected $rule = [
-        'user_name'    => 'require|max:18|unique:user_name',
+        'user_name'    => 'require|max:18|unique',
         'real_name'    => 'require',
         'password'     => 'require|min:5|max:18',
         'dept_id'      => 'require',
@@ -60,7 +60,7 @@ class SystemUserValidate extends Validate
      */
     protected function unique($value, $rule, $data = []): bool
     {
-        $query = SystemUser::where('user_name', $value);
+        $query = SystemUser::where('user_name', $value)->withTrashed();
         // 如果是更新操作，可以排除当前记录
         if (isset($data['id'])) {
             $query->where('id', '<>', $data['id']);
-- 
Gitee


From 040637e25ec5b94eb52f12064134ffe78d61bf7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=AF=E7=88=B1=E7=8E=A9=E5=85=B7=E7=86=8A?=
 <978713427@qq.com>
Date: Fri, 22 Nov 2024 14:52:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8linux=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/system/SystemDictService.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/services/system/SystemDictService.php b/app/services/system/SystemDictService.php
index fee0209..146484e 100644
--- a/app/services/system/SystemDictService.php
+++ b/app/services/system/SystemDictService.php
@@ -84,7 +84,7 @@ class SystemDictService extends BaseService
             $files = glob($directory . '/*.php');
 
             foreach ($files as $file) {
-                $className = 'App\\Enum\\' . pathinfo($file, PATHINFO_FILENAME);
+                $className = 'app\\num\\' . pathinfo($file, PATHINFO_FILENAME);
                 if ($this->isEnumClass($className)) {
                     $enumInfo = $this->getEnumInfo($className);
                     if ($enumInfo) {
@@ -109,6 +109,7 @@ class SystemDictService extends BaseService
             $reflectionClass = new ReflectionClass($className);
             return $reflectionClass->isEnum();
         } catch (ReflectionException $e) {
+            var_dump($e->getMessage());
             return false; // 如果遇到错误则返回 false
         }
     }
-- 
Gitee