|
|
@@ -110,12 +110,17 @@ class Users extends Base
|
|
|
if(empty($param['group_id'])){
|
|
|
return json(['code' => -3, 'data' => '', 'msg' => '请选择分组']);
|
|
|
}
|
|
|
+ // 检测密码
|
|
|
+ $n = preg_match_all("/^[a-zA-Z\d_]{6,}$/",$param['user_pwd'],$array);
|
|
|
+ if($n != 1){
|
|
|
+ return json(['code' => -8, 'data' => '', 'msg' => '密码长度不够，请重新输入']);
|
|
|
+ }
|
|
|
// 检测头像
|
|
|
// if(empty($param['user_avatar'])){
|
|
|
// return json(['code' => -4, 'data' => '', 'msg' => '请上传头像']);
|
|
|
// }
|
|
|
|
|
|
- $param['user_pwd'] = md5('123456' . config('salt'));
|
|
|
+ $param['user_pwd'] = md5($param['user_pwd'] . config('salt'));
|
|
|
$param['online'] = 2; // 离线状态
|
|
|
|
|
|
try{
|
|
|
@@ -143,13 +148,38 @@ class Users extends Base
|
|
|
$param = input('post.');
|
|
|
unset($param['file']); // 删除layui头像上传隐藏字段
|
|
|
|
|
|
+ // 检测客服工号
|
|
|
+ if(!empty($param['user_job_number'])){
|
|
|
+ $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(empty($param['group_id'])){
|
|
|
+ return json(['code' => -3, 'data' => '', 'msg' => '请选择分组']);
|
|
|
+ }
|
|
|
+ // 检测密码
|
|
|
+ if(!empty($param['user_pwd'])){
|
|
|
+ $n = preg_match_all("/^[a-zA-Z\d_]{6,}$/",$param['user_pwd'],$array);
|
|
|
+ if($n != 1){
|
|
|
+ return json(['code' => -8, 'data' => '', 'msg' => '密码长度不够，请重新输入']);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if(empty($param['group_id'])){
|
|
|
return json(['code' => -2, 'data' => '', 'msg' => '请选择分组']);
|
|
|
}
|
|
|
|
|
|
$addar = array();
|
|
|
- $where = array();
|
|
|
- $where['id'] = $param['id'];
|
|
|
+ $addar['user_name'] = $param['user_name'];
|
|
|
+ $addar['user_job_number'] = $param['user_job_number'];
|
|
|
+ if(!empty($param['user_pwd'])){
|
|
|
+ $addar['user_pwd'] = md5($param['user_pwd'] . config('salt'));
|
|
|
+ }
|
|
|
+ $addar['user_email'] = $param['user_email'];
|
|
|
+ $addar['phone'] = $param['phone'];
|
|
|
+ $addar['fullname'] = $param['fullname'];
|
|
|
+ $addar['signature'] = $param['signature'];
|
|
|
$addar['group_id'] = $param['group_id'];
|
|
|
$addar['status'] = $param['status'];
|
|
|
if(!empty($param['user_avatar'])){
|
|
|
@@ -230,9 +260,9 @@ class Users extends Base
|
|
|
// $operate = '<a href="' . url('users/edituser', ['id' => $id]) . '">';
|
|
|
// $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
|
|
|
|
|
|
- $operate = '<a href="javascript:resetPwd(' . $id . ')"><button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 重置密码</button></a>';
|
|
|
+// $operate = '<a href="javascript:resetPwd(' . $id . ')"><button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 重置密码</button></a>';
|
|
|
|
|
|
- $operate .= '<a style="margin-left:5px;" href="' . url('users/editUser', ['id' => $id]) . '">';
|
|
|
+ $operate = '<a style="margin-left:5px;" href="' . url('users/editUser', ['id' => $id]) . '">';
|
|
|
$operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
|
|
|
|
|
|
$operate .= '<a style="margin-left:5px;" href="javascript:userDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
|
Jonlin