diff --git a/app/admin/validate/system/SystemUserValidate.php b/app/admin/validate/system/SystemUserValidate.php index cc9913c176c8a827e2b471556f031fe1c121c8ef..d4681959c5101ff1c4edbff5997db58c3f88e019 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']); diff --git a/app/services/system/SystemDictService.php b/app/services/system/SystemDictService.php index fee02094624381e6761560b6c5bb812048eb5a16..146484e7159cc5fe5aba8e9f67f44689d41f34f2 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 } }