代码提交

This commit is contained in:
wong
2025-11-14 11:39:20 +08:00
parent 58243d9c17
commit 5715849de5
6 changed files with 88 additions and 11 deletions

View File

@@ -176,9 +176,9 @@ class CreateCompanyController extends BaseController
protected function createFuncUsers(array $params): void
{
$seedCols = [
['account' => $params['account'] . '_01', 'username' => $params['username'] . '_子账号01', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
['account' => $params['account'] . '_02', 'username' => $params['username'] . '_子账号02', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
['account' => $params['account'] . '_03', 'username' => $params['username'] . '_子账号03', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
['account' => $params['account'] . '_01', 'username' => $params['username'] . '_子账号01', 'status' => UsersModel::ADMIN_STP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::MASTER_USER],
['account' => $params['account'] . '_02', 'username' => $params['username'] . '_子账号02', 'status' => UsersModel::ADMIN_STP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::MASTER_USER],
['account' => $params['account'] . '_03', 'username' => $params['username'] . '_子账号03', 'status' => UsersModel::ADMIN_STP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::MASTER_USER],
['account' => $params['account'] . '_offline', 'username' => $params['username'] . '_处理离线专用', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
['account' => $params['account'] . '_delete', 'username' => $params['username'] . '_处理删除专用', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
];
@@ -267,7 +267,7 @@ class CreateCompanyController extends BaseController
protected function setDepartmentPrivileges(array $params): void
{
$params = ArrHelper::getValue('companyId=departmentId', $params);
$params = ArrHelper::getValue('companyId', $params);
$accountController = new \app\api\controller\AccountController();
$accountController->setPrivileges(['id' => $params['companyId']]);
}
@@ -283,8 +283,12 @@ 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);
@@ -292,9 +296,6 @@ class CreateCompanyController extends BaseController
$this->createFuncUsers($params);
Db::commit();
// 设置部门权限 ?????
$this->setDepartmentPrivileges($params);
return ResponseHelper::success();
} catch (Exception $e) {
Db::rollback();