From 6f5244d5611cbe391969f90c4bc78a7f2e80fb20 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Mon, 4 Jul 2022 14:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BC=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Requests/CustomerRequest.php | 7 +++++--
 beike/Admin/Services/CustomerService.php      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/beike/Admin/Http/Requests/CustomerRequest.php b/beike/Admin/Http/Requests/CustomerRequest.php
index 684e0109..8b561384 100644
--- a/beike/Admin/Http/Requests/CustomerRequest.php
+++ b/beike/Admin/Http/Requests/CustomerRequest.php
@@ -32,12 +32,15 @@ class CustomerRequest extends FormRequest
      */
     public function rules()
     {
-        return [
+        $rules = [
             'name' => 'required|max:64',
             'email' => 'required|email:rfc,dns|unique:customers',
-            'password' => 'required|max:64',
             'customer_group_id' => 'required|exists:customer_groups,id',
         ];
+        if (!$this->request->get('id')) {
+            $rules['password'] = 'required|max:64';
+        }
+        return $rules;
     }
 
     public function attributes()
diff --git a/beike/Admin/Services/CustomerService.php b/beike/Admin/Services/CustomerService.php
index b618e88f..a3639493 100644
--- a/beike/Admin/Services/CustomerService.php
+++ b/beike/Admin/Services/CustomerService.php
@@ -20,7 +20,7 @@ class CustomerService
 {
     public static function create($data)
     {
-        $data['locale'] = setting('locale');
+        $data['locale'] = setting('system.locale');
         $data['from'] = 'admin';
         $customer = CustomerRepo::create($data);
         return $customer;