fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wong
2025-04-18 14:23:49 +08:00
parent ac8600ab6d
commit c5774ffa29
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Server/application/api/controller/AccountController.php
View File

@@ -26,10 +26,6 @@ class AccountController extends BaseController
public function getlist($pageIndex = '', $pageSize = '', $isJob = false) public function getlist($pageIndex = '', $pageSize = '', $isJob = false)
{ {
$api = new AccountLogic();
$api->login()->create();
// 获取授权token // 获取授权token
$authorization = trim($this->request->header('authorization', $this->authorization)); $authorization = trim($this->request->header('authorization', $this->authorization));
if (empty($authorization)) { if (empty($authorization)) {
@@ -284,7 +280,7 @@ class AccountController extends BaseController
return successJson($res, '账号创建成功'); return successJson($res, '账号创建成功');
} else { } else {
// 如果创建账号失败，删除已创建的部门 // 如果创建账号失败，删除已创建的部门
$this->deleteDepartment($departmentResult); $this->deleteDepartment($accountResult);
DB::rollback(); DB::rollback();
return errorJson('创建账号失败：' . $accountResult); return errorJson('创建账号失败：' . $accountResult);
} }
@@ -329,6 +325,7 @@ class AccountController extends BaseController
// 保存数据到数据库 // 保存数据到数据库
if (!empty($response)) { if (!empty($response)) {
CompanyModel::where('1=1')->delete();
$this->processDepartments($response); $this->processDepartments($response);
} }
@@ -506,7 +503,7 @@ class AccountController extends BaseController
$header = setHeader($headerData, $authorization, 'json'); $header = setHeader($headerData, $authorization, 'json');
// 发送删除请求 // 发送删除请求
$result = requestCurl($this->baseUrl . 'api/Department/del/' . $id, [], 'DELETE', $header, 'json'); $result = requestCurl($this->baseUrl . 'api/Department/del/' . $id, [], 'DELETE', $header);
if ($result) { if ($result) {
return errorJson($result); return errorJson($result);