mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-07-22 00:01:20 +08:00
parent 63aa866322
commit 98ea371089
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/adminapi/controller/auth/AdminController.php
View File

@ -86,6 +86,7 @@ class AdminController extends BaseAdminController
public function edit() public function edit()
{ {
$params = (new AdminValidate())->post()->goCheck('edit'); $params = (new AdminValidate())->post()->goCheck('edit');
$params['qualification'] = json_encode($params['qualification']);
$result = AdminLogic::edit($params); $result = AdminLogic::edit($params);
if (true === $result) { if (true === $result) {
return $this->success('操作成功', [], 1, 1); return $this->success('操作成功', [], 1, 1);

4
app/adminapi/logic/CompanyLogic.php
View File

@ -62,7 +62,7 @@ class CompanyLogic extends BaseLogic
'master_phone' => $params['master_phone'], 'master_phone' => $params['master_phone'],
'master_email' => $params['master_email'], 'master_email' => $params['master_email'],
'other_contacts' => $params['other_contacts'], 'other_contacts' => $params['other_contacts'],
'area_manager' => $params['area_manager'], 'area_manager' => $params['area_manager']??0,
// 'is_contract' => $params['is_contract'], // 'is_contract' => $params['is_contract'],
// 'account' => $params['account'], // 'account' => $params['account'],
// 'password' => $params['password'], // 'password' => $params['password'],
@ -111,7 +111,7 @@ class CompanyLogic extends BaseLogic
'master_phone' => $params['master_phone'], 'master_phone' => $params['master_phone'],
'master_email' => $params['master_email'], 'master_email' => $params['master_email'],
'other_contacts' => $params['other_contacts'], 'other_contacts' => $params['other_contacts'],
'area_manager' => $params['area_manager'], 'area_manager' => $params['area_manager']??0,
// 'is_contract' => $params['is_contract'], // 'is_contract' => $params['is_contract'],
// 'account' => $params['account'], // 'account' => $params['account'],
// 'password' => $params['password'], // 'password' => $params['password'],

7
app/adminapi/logic/auth/AdminLogic.php
View File

@ -87,7 +87,7 @@ class AdminLogic extends BaseLogic
Db::startTrans(); Db::startTrans();
try { try {
// 基础信息 // 基础信息
$role_id_arr=explode(',',$params['role_id']) ?? [];
$data=$params; $data=$params;
// 头像 // 头像
$data['avatar'] = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : ''; $data['avatar'] = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : '';
@ -101,7 +101,7 @@ class AdminLogic extends BaseLogic
// 禁用或更换角色后.设置token过期 // 禁用或更换角色后.设置token过期
$roleId = AdminRole::where('admin_id', $params['id'])->column('role_id'); $roleId = AdminRole::where('admin_id', $params['id'])->column('role_id');
$editRole = false; $editRole = false;
if (!empty(array_diff_assoc($roleId, $params['role_id']))) { if (!empty(array_diff_assoc($roleId, $role_id_arr))) {
$editRole = true; $editRole = true;
} }
@ -111,7 +111,6 @@ class AdminLogic extends BaseLogic
self::expireToken($token['token']); self::expireToken($token['token']);
} }
} }
Admin::strict(false)->update($data); Admin::strict(false)->update($data);
(new AdminAuthCache($params['id']))->clearAuthCache(); (new AdminAuthCache($params['id']))->clearAuthCache();
@ -120,7 +119,7 @@ class AdminLogic extends BaseLogic
AdminDept::delByUserId($params['id']); AdminDept::delByUserId($params['id']);
AdminJobs::delByUserId($params['id']); AdminJobs::delByUserId($params['id']);
// 角色 // 角色
self::insertRole($params['id'], explode(',',$params['role_id']) ?? []); self::insertRole($params['id'], $role_id_arr);
self::contract($params['id'], $params); self::contract($params['id'], $params);
// 部门 // 部门
// self::insertDept($params['id'], $params['dept_id'] ?? []); // self::insertDept($params['id'], $params['dept_id'] ?? []);