Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan
2023-03-04 13:26:04 +08:00
parent ba3eb7f27c
commit abe953f234
5 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/UsersController.php
View File

@@ -526,7 +526,7 @@ class UsersController extends AbstractController
return preg_match("/\(M\)$/", $item);
});
if ($dep) {
$tags[] = preg_replace("/\(M\)$/", "", $dep[0]) . " " . Base::Lang("负责人");
$tags[] = preg_replace("/\(M\)$/", "", trim($dep[0])) . " " . Base::Lang("负责人");
}
if ($userInfo->isTemp()) {
$tags[] = Base::Lang("临时");
@@ -1427,6 +1427,7 @@ class UsersController extends AbstractController
'parent_id' => $parent_id,
'owner_userid' => $owner_userid,
], $dialog_useid);
Cache::forever("UserDepartment::rand", Base::generatePassword());
//
return Base::retSuccess($parent_id > 0 ? '保存成功' : '新建成功');
}
@@ -1456,6 +1457,7 @@ class UsersController extends AbstractController
return Base::retError('部门不存在或已被删除');
}
$userDepartment->deleteDepartment();
Cache::forever("UserDepartment::rand", Base::generatePassword());
//
return Base::retSuccess('删除成功');
}