Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem
This commit is contained in:
commit
97b418b3fd
@ -87,14 +87,8 @@ class AdminLogic extends BaseLogic
|
|||||||
Db::startTrans();
|
Db::startTrans();
|
||||||
try {
|
try {
|
||||||
// 基础信息
|
// 基础信息
|
||||||
$data = [
|
|
||||||
'id' => $params['id'],
|
|
||||||
'name' => $params['name'],
|
|
||||||
'account' => $params['account'],
|
|
||||||
'disable' => $params['disable'],
|
|
||||||
'multipoint_login' => $params['multipoint_login']
|
|
||||||
];
|
|
||||||
|
|
||||||
|
$data=$params;
|
||||||
// 头像
|
// 头像
|
||||||
$data['avatar'] = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : '';
|
$data['avatar'] = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : '';
|
||||||
|
|
||||||
@ -118,7 +112,7 @@ class AdminLogic extends BaseLogic
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Admin::update($data);
|
Admin::strict(false)->update($data);
|
||||||
(new AdminAuthCache($params['id']))->clearAuthCache();
|
(new AdminAuthCache($params['id']))->clearAuthCache();
|
||||||
|
|
||||||
// 删除旧的关联信息
|
// 删除旧的关联信息
|
||||||
@ -364,8 +358,8 @@ class AdminLogic extends BaseLogic
|
|||||||
$model->type = 2;
|
$model->type = 2;
|
||||||
}
|
}
|
||||||
$model->update_time = time();
|
$model->update_time = time();
|
||||||
$model->setAttrs($data);
|
// $model->setAttrs($data);
|
||||||
$model->save();
|
$model->strict(false)->save($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user