Jimy há 6 anos atrás
pai
commit
cbf0f4602e
1 ficheiros alterados com 32 adições e 32 exclusões
  1. 32 32
      application/admin/controller/Users.php

+ 32 - 32
application/admin/controller/Users.php

@@ -116,46 +116,46 @@ class Users extends Base
         if(request()->isAjax()){
 
             $param = input('post.');
-            unset($param['file']); // 删除layui头像上传隐藏字段
 
             if(empty($param['group_id'])){
-                return json(['code' => -4, 'data' => '', 'msg' => '请选择分组']);
-            }
-
-            // 检测用户修改的用户名是否重复
-            /*$has = db('users')->where('user_name', $param['user_name'])->where('id', '<>', $param['id'])->find();
-            if(!empty($has)){
-                return json(['code' => -1, 'data' => '', 'msg' => '该客服已经存在']);
-            }*/
+                return json(['code' => -2, 'data' => '', 'msg' => '请选择分组']);
+            }
+
+            $addar = array();
+            $where = array();
+            $where['id'] = $param['id'];
+            $userspw = db('users')->where($where)->field("user_pwd")->find();
+            $newpwd = md5($param['new_pwd'] . config('salt'));//新密码
+            $oldpwd = md5($param['user_pwd'] . config('salt'));//旧密码
+            
+            // 检测用户新密码与原密码是否重复
+            if(!empty($param['new_pwd'])){
+                if($oldpwd != $userspw['user_pwd']){
+                    return json(['code' => -8, 'data' => '', 'msg' => '原密码不对']);
+                }
 
-            // 检测用户修改的工号是否重复
-            $user_job_number = db('users')->where('user_job_number', $param['user_job_number'])->where('id', '<>', $param['id'])->find();
-            if(!empty($user_job_number)){
-                return json(['code' => -2, 'data' => '', 'msg' => '该工号已经存在']);
-            }
+                if($newpwd==$userspw['user_pwd']){
+                    return json(['code' => -3, 'data' => '', 'msg' => '新密码与原密码一致']);
+                }
 
-            // 检测用户修改的邮箱是否重复
-            /*$user_email = db('users')->where('user_email', $param['user_email'])->where('id', '<>', $param['id'])->find();
-            if(!empty($user_email)){
-                return json(['code' => -2, 'data' => '', 'msg' => '该邮箱已经存在']);
+                if($param['renew_pwd'] != $param['new_pwd']){
+                    return json(['code' => -7, 'data' => '', 'msg' => '新密码与确认密码不一致']);
+                }
+                $addar['user_pwd'] = md5($param['new_pwd'] . config('salt'));
             }
-
-            // 修改用户头像
-            if(empty($param['user_avatar'])){
-                unset($param['user_avatar']);
+            
+            if(!empty($param['user_avatar'])){
+                $addar['user_avatar'] = $param['user_avatar'];
             }
-
-            // 修改用户密码
-            if(empty($param['user_pwd'])){
-                unset($param['user_pwd']);
-            }else{
-                $param['user_pwd'] = md5($param['user_pwd'] . config('salt'));
-            }*/
-
+            $addar['fullname'] = $param['fullname'];
+            $addar['signature'] = $param['signature'];
+            $addar['group_id'] = $param['group_id'];
+            $addar['status'] = $param['status'];
+          
             try{
-                db('users')->where('id', $param['id'])->update($param);
+                db('users')->where('id', $param['id'])->update($addar);
             }catch(\Exception $e){
-                return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
+                return json(['code' => -6, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
             return json(['code' => 1, 'data' => '', 'msg' => '编辑客服成功']);