|
|
@@ -243,7 +243,7 @@ class MiddleGroundService extends Service
|
|
|
$password = $this->generateAt8CharPassword();
|
|
|
//创建账号
|
|
|
$model_2 = new Employee();
|
|
|
- $model_2->title = $data['title'];
|
|
|
+ $model_2->title = $data['title'] . '管理员';
|
|
|
$model_2->code = $data['code'];
|
|
|
$model_2->account = $account;
|
|
|
$model_2->password = Hash::make($password);
|
|
|
@@ -414,11 +414,11 @@ class MiddleGroundService extends Service
|
|
|
$id = $item['id'];
|
|
|
$extra = $extraMap[$id] ?? null;
|
|
|
|
|
|
- $item['role'] = $extra['role_ids'] ?? [];
|
|
|
- $item['role_name'] = isset($extra['role_names']) ? implode(',', $extra['role_names']) : '';
|
|
|
+ $item['role'] = $extra['role_ids'] ?? [];
|
|
|
+ $item['role_name'] = isset($extra['role_names']) ? implode(',', $extra['role_names']) : '';
|
|
|
$item['top_depart_title'] = $depart_map[$item['top_depart_id']];
|
|
|
|
|
|
- $item['crt_time'] = !empty($item['crt_time']) ? date("Y-m-d", $item['crt_time']) : "";
|
|
|
+ $item['crt_time'] = !empty($item['crt_time']) ? date("Y-m-d", $item['crt_time']) : "";
|
|
|
}
|
|
|
|
|
|
return $data;
|
|
|
@@ -454,7 +454,6 @@ class MiddleGroundService extends Service
|
|
|
DB::beginTransaction();
|
|
|
$model = new Employee();
|
|
|
$model = $model->where('id',$data['id'])->first();
|
|
|
- $model->title = $data['title'] ?? "";
|
|
|
if($model->is_admin && $data['password'] !== '******') {
|
|
|
$model->password = Hash::make($data['password']);
|
|
|
$model->p_version = $model->p_version + 1;
|
|
|
@@ -495,14 +494,6 @@ class MiddleGroundService extends Service
|
|
|
->exists();
|
|
|
if(! $bool) return [false, '管理员账户不存在或已被删除'];
|
|
|
|
|
|
- if(empty($data['title'])) return [false, '公司名称不能为空'];
|
|
|
- $exists = Depart::where('parent_id', 0)
|
|
|
- ->where('del_time', 0)
|
|
|
- ->where('title', $data['title'])
|
|
|
- ->where('id', '<>', $data['id'])
|
|
|
- ->exists();
|
|
|
- if($exists) return [false, '公司名称已存在,编辑失败'];
|
|
|
-
|
|
|
if(empty($data['password'])) return [false, '密码不能为空'];
|
|
|
if(mb_strlen($data['password']) < 6) return [false, '密码长度不得小于6位长度'];
|
|
|
|