|
@@ -134,7 +134,7 @@ class EmployeeService extends Service
|
|
|
$model->entry_time = $data['entry_time'] ?? '';
|
|
$model->entry_time = $data['entry_time'] ?? '';
|
|
|
$model->birth_date = $data['birth_date']??'';
|
|
$model->birth_date = $data['birth_date']??'';
|
|
|
$model->state = empty($data['leave_time']) ? Employee::USE : Employee::NOT_USE;
|
|
$model->state = empty($data['leave_time']) ? Employee::USE : Employee::NOT_USE;
|
|
|
- $model->is_admin = $data['is_admin'];
|
|
|
|
|
|
|
+ $model->is_admin = $data['is_admin'] ? 1 : 0;
|
|
|
if($model->pic != $data['pic']){
|
|
if($model->pic != $data['pic']){
|
|
|
// 使用正则表达式匹配特定路径部分并替换为空
|
|
// 使用正则表达式匹配特定路径部分并替换为空
|
|
|
$pattern = '/^https?:\/\/[^\/]+\/image\//';
|
|
$pattern = '/^https?:\/\/[^\/]+\/image\//';
|
|
@@ -142,7 +142,7 @@ class EmployeeService extends Service
|
|
|
(new FileUploadService())->delLocalPublicFile($replacedUrl);
|
|
(new FileUploadService())->delLocalPublicFile($replacedUrl);
|
|
|
}
|
|
}
|
|
|
$model->pic = $data['pic'] ?? "";
|
|
$model->pic = $data['pic'] ?? "";
|
|
|
- if($model->is_admin == 1){
|
|
|
|
|
|
|
+ if($model->is_admin){
|
|
|
if($data['password'] !== '********') $model->password = Hash::make($data['password']);
|
|
if($data['password'] !== '********') $model->password = Hash::make($data['password']);
|
|
|
if(! empty($data['account'])) {
|
|
if(! empty($data['account'])) {
|
|
|
$model->account = $data['account'];
|
|
$model->account = $data['account'];
|
|
@@ -214,11 +214,11 @@ class EmployeeService extends Service
|
|
|
$model->entry_time = $data['entry_time'] ?? '';
|
|
$model->entry_time = $data['entry_time'] ?? '';
|
|
|
$model->state = empty($data['leave_time']) ? Employee::USE : Employee::NOT_USE;
|
|
$model->state = empty($data['leave_time']) ? Employee::USE : Employee::NOT_USE;
|
|
|
$model->crt_id = $user['id'];
|
|
$model->crt_id = $user['id'];
|
|
|
- $model->is_admin = $data['is_admin'];
|
|
|
|
|
|
|
+ $model->is_admin = $data['is_admin'] ? 1 : 0;
|
|
|
$model->sex = $data['sex']??'男';
|
|
$model->sex = $data['sex']??'男';
|
|
|
$model->birth_date = $data['birth_date']??'';
|
|
$model->birth_date = $data['birth_date']??'';
|
|
|
$model->pic = $data['pic'] ?? '';
|
|
$model->pic = $data['pic'] ?? '';
|
|
|
- if($model->is_admin == 1){
|
|
|
|
|
|
|
+ if($model->is_admin){
|
|
|
$model->password = Hash::make($data['password']);
|
|
$model->password = Hash::make($data['password']);
|
|
|
if(! empty($data['account'])) {
|
|
if(! empty($data['account'])) {
|
|
|
$model->account = $data['account'];
|
|
$model->account = $data['account'];
|
cqp