From b6e1277417a589ae5e88365c35cc9010590d8604 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 29 May 2020 14:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Index.php |  4 ++--
 app/admin/controller/User.php  | 35 +++++++++++++++++++++-------------
 vendor/services.php            |  2 +-
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index 889cbc0ee..03a5e16fb 100644
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -85,8 +85,8 @@ class Index extends Controller
             $data = $this->_vali([
                 'password.require'            => '登录密码不能为空！',
                 'repassword.require'          => '重复密码不能为空！',
-                'oldpassword.require'         => '旧密码不能为空！',
-                'password.confirm:repassword' => '验证密码与新密码不匹配！',
+                'oldpassword.require'         => '旧的密码不能为空！',
+                'password.confirm:repassword' => '两次输入的密码不一致！',
             ]);
             $user = $this->app->db->name('SystemUser')->where(['id' => $id])->find();
             if (md5($data['oldpassword']) !== $user['password']) {
diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index b6bb9472d..caf9fdb42 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -95,11 +95,13 @@ class User extends Controller
             $this->verify = false;
             $this->_form($this->table, 'pass');
         } else {
-            $post = $this->request->post();
-            if ($post['password'] !== $post['repassword']) {
-                $this->error('两次输入的密码不一致！');
-            }
-            if (data_save($this->table, ['id' => $post['id'], 'password' => md5($post['password'])], 'id')) {
+            $data = $this->_vali([
+                'id.require'                  => '用户ID不能为空！',
+                'password.require'            => '登录密码不能为空！',
+                'repassword.require'          => '重复密码不能为空！',
+                'repassword.confirm:password' => '两次输入的密码不一致！'
+            ]);
+            if (data_save($this->table, ['id' => $data['id'], 'password' => md5($data['password'])], 'id')) {
                 $this->success('密码修改成功，下次请使用新密码登录！', '');
             } else {
                 $this->error('密码修改失败，请稍候再试！');
@@ -117,16 +119,23 @@ class User extends Controller
     protected function _form_filter(&$data)
     {
         if ($this->request->isPost()) {
-            // 用户权限处理
-            $data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : '';
-            // 用户账号重复检查
-            if (isset($data['id'])) unset($data['username']);
-            elseif ($this->app->db->name($this->table)->where(['username' => $data['username'], 'is_deleted' => '0'])->count() > 0) {
-                $this->error("账号{$data['username']}已经存在，请使用其它账号！");
+            if (isset($data['id']) && $data['id'] > 0) {
+                unset($data['username']);
+            } else {
+                // 检查登录账号是否出现重复
+                if (empty($data['username'])) $this->error('登录账号不能为空！');
+                $where = ['username' => $data['username'], 'is_deleted' => 0];
+                if ($this->app->db->name($this->table)->where($where)->count() > 0) {
+                    $this->error("账号{$data['username']}已经存在，请使用其它账号！");
+                }
+                // 新添加的用户密码与账号相同
+                $data['password'] = md5($data['username']);
             }
+            // 账号权限绑定处理
+            $data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : '';
         } else {
-            $data['authorize'] = explode(',', isset($data['authorize']) ? $data['authorize'] : '');
-            $this->authorizes = $this->app->db->name('SystemAuth')->where(['status' => '1'])->order('sort desc,id desc')->select();
+            $data['authorize'] = explode(',', $data['authorize'] ?: '');
+            $this->authorizes = $this->app->db->name('SystemAuth')->where(['status' => '1'])->order('sort desc,id desc')->select()->toArray();
         }
     }
 
diff --git a/vendor/services.php b/vendor/services.php
index e371eed01..d9aabe57b 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-05-29 11:46:38
+// This file is automatically generated at:2020-05-29 11:47:46
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',