From 047e6ee4b361ffc27a3bb853740a1bd29914a95e Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Sun, 25 Jun 2023 14:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E5=AF=86=E7=A0=81=E4=B8=BA=E9=9D=9E=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php b/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php
index 3350b2925..ef939a3c4 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemAdmin.php
@@ -169,9 +169,13 @@ class SystemAdmin extends AuthController
             ['new_pwd', ''],
             ['conf_pwd', ''],
         ]);
-        if (!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,}$/', $data['new_pwd'])) {
-            return app('json')->fail(400183);
+
+        if ($data['pwd']) {
+            if (!preg_match('/^(?![^a-zA-Z]+$)(?!\D+$).{6,}$/', $data['new_pwd'])) {
+                return app('json')->fail(400183);
+            }
         }
+        
         if ($this->services->updateAdmin($this->adminId, $data))
             return app('json')->success(100001);
         else