diff --git a/Server/application/api/controller/AccountController.php b/Server/application/api/controller/AccountController.php index f239be006..ce27ce54e 100644 --- a/Server/application/api/controller/AccountController.php +++ b/Server/application/api/controller/AccountController.php @@ -162,6 +162,7 @@ class AccountController extends BaseController 'createTime' => time(), 'privilegeIds' => json_encode([]) ]); + $this->setPrivileges(['id' => $result]); return successJson($res); } else { return errorJson($result); @@ -245,12 +246,14 @@ class AccountController extends BaseController 'createTime' => time(), 'lastUpdateTime' => 0 ]); + + $this->setPrivileges(['id' => $departmentResult]); + } else { DB::rollback(); return errorJson('创建部门失败:' . $departmentResult); } - // 2. 创建账号 $accountParams = [ 'userName' => $accountName, @@ -559,6 +562,7 @@ class AccountController extends BaseController 'syncPrivilege' => true ]; + // 设置请求头 $headerData = ['client:system']; $header = setHeader($headerData, $authorization, 'json'); diff --git a/Server/application/superadmin/controller/company/CreateCompanyController.php b/Server/application/superadmin/controller/company/CreateCompanyController.php index c0a72b06b..fcbbc3bd4 100644 --- a/Server/application/superadmin/controller/company/CreateCompanyController.php +++ b/Server/application/superadmin/controller/company/CreateCompanyController.php @@ -257,20 +257,7 @@ class CreateCompanyController extends BaseController } } - /** - * 设置部门权限 - * - * @param array $params - * @return void - * @throws Exception - */ - protected function setDepartmentPrivileges(array $params): void - { - $params = ArrHelper::getValue('companyId=id', $params); - $accountController = new \app\api\controller\AccountController(); - $accountController->setPrivileges(['id' => $params['companyId']]); - } /** * 创建新项目 @@ -283,12 +270,8 @@ class CreateCompanyController extends BaseController $params = $this->request->only(['name', 'status', 'username', 'account', 'password', 'phone', 'memo']); $params = $this->dataValidate($params)->creatS2About($params); - // 设置部门权限 - $this->setDepartmentPrivileges($params); - Db::startTrans(); - $this->checkCompanyNameOrAccountOrPhoneExists(ArrHelper::getValue('name,account,phone', $params)); $this->createCkbAbout($params);