diff --git a/Server/application/superadmin/controller/company/CreateCompanyController.php b/Server/application/superadmin/controller/company/CreateCompanyController.php index 1685c460..efebb4f3 100644 --- a/Server/application/superadmin/controller/company/CreateCompanyController.php +++ b/Server/application/superadmin/controller/company/CreateCompanyController.php @@ -126,7 +126,7 @@ class CreateCompanyController extends BaseController protected function ckbCreateUser(array $params): void { $params = ArrHelper::getValue( - 'username,account,password,companyId,s2_accountId,status,realName', + 'username,account,password,companyId,s2_accountId,status,phone', $params ); @@ -156,6 +156,36 @@ class CreateCompanyController extends BaseController $this->ckbCreateUser($params); } + /** + * 检查项目名称是否已存在 + * + * @param array $where + * @return void + * @throws \Exception + */ + protected function checkCompanyNameOrAccountOrPhoneExists(array $where): void + { + extract($where); + + // 项目名称尽量不重名 + $exists = CompanyModel::where(compact('name'))->count() > 0; + if ($exists) { + throw new \Exception('项目名称已存在', 403); + } + + // 账号不重名 + $exists = UsersModel::where(compact('account'))->count() > 0; + if ($exists) { + throw new \Exception('用户账号已存在', 403); + } + + // 手机号不重名 + $exists = UsersModel::where(compact('phone'))->count() > 0; + if ($exists) { + throw new \Exception('手机号已存在', 403); + } + } + /** * 创建新项目 * @@ -168,7 +198,7 @@ class CreateCompanyController extends BaseController $params = $this->dataValidate($params)->creatS2About($params); Db::startTrans(); - + $this->checkCompanyNameOrAccountOrPhoneExists(ArrHelper::getValue('name,account,phone', $params)); $this->createCkbAbout($params); Db::commit(); diff --git a/Server/application/superadmin/controller/company/UpdateCompanyController.php b/Server/application/superadmin/controller/company/UpdateCompanyController.php index 3cd2f4b9..992d1065 100644 --- a/Server/application/superadmin/controller/company/UpdateCompanyController.php +++ b/Server/application/superadmin/controller/company/UpdateCompanyController.php @@ -85,7 +85,7 @@ class UpdateCompanyController extends BaseController */ protected function updateUserAccount(array $params): void { - $params = ArrHelper::getValue('username,account,password,realName,status', $params); + $params = ArrHelper::getValue('username,account,password,phone,status', $params); $params = ArrHelper::rmValue($params); if (isset($params['password'])) { @@ -119,7 +119,7 @@ class UpdateCompanyController extends BaseController /** * 更新触客宝端数据 - * + * * @param array $params * @return self * @throws \Exception @@ -142,7 +142,7 @@ class UpdateCompanyController extends BaseController * @return void * @throws \Exception */ - protected function checkCompanyNameAndAccountExists(array $where): void + protected function checkCompanyNameOrAccountOrPhoneExists(array $where): void { extract($where); @@ -152,12 +152,17 @@ class UpdateCompanyController extends BaseController throw new \Exception('项目名称已存在', 403); } - // 账号尽量不重名 // TODO(数据迁移时,存客宝,主账号先查询出id,通过id查询出S2的最新信息,然后更新。) $exists = UsersModel::where(compact('account'))->where('companyId', '<>', $id)->count() > 0; if ($exists) { throw new \Exception('用户账号已存在', 403); } + + // 手机号不重复 + $exists = UsersModel::where(compact('phone'))->where('companyId', '<>', $id)->count() > 0; + if ($exists) { + throw new \Exception('手机号已存在', 403); + } } /** @@ -207,7 +212,7 @@ class UpdateCompanyController extends BaseController // 数据验证 $this->dataValidate($params); - $this->checkCompanyNameAndAccountExists(ArrHelper::getValue('id,name,account', $params)); + $this->checkCompanyNameOrAccountOrPhoneExists(ArrHelper::getValue('id,name,account,phone', $params)); Db::startTrans(); $this->updateCkbAbout($params)->updateS2About($params); diff --git a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx index 02b7fa71..a489805e 100644 --- a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx +++ b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx @@ -141,7 +141,7 @@ export default function EditProjectPage({ params }: { params: { id: string } })
- +
- -
- - setPassword(e.target.value)} - placeholder="不修改请留空" - /> -
- -
- - setConfirmPassword(e.target.value)} - placeholder="不修改请留空" - /> -
- +
禁用
+ +
+ + setPassword(e.target.value)} + placeholder="不修改请留空" + /> +
+ +
+ + setConfirmPassword(e.target.value)} + placeholder="不修改请留空" + /> +
diff --git a/SuperAdmin/app/dashboard/projects/new/page.tsx b/SuperAdmin/app/dashboard/projects/new/page.tsx index 79920898..cd10f9b9 100644 --- a/SuperAdmin/app/dashboard/projects/new/page.tsx +++ b/SuperAdmin/app/dashboard/projects/new/page.tsx @@ -21,7 +21,7 @@ export default function NewProjectPage() { account: "", password: "", confirmPassword: "", - realName: "", + phone: "", nickname: "", description: "", status: "1" // 默认启用 @@ -63,7 +63,7 @@ export default function NewProjectPage() { name: formData.name, account: formData.account, password: formData.password, - realName: formData.realName, + phone: formData.phone, username: formData.nickname, description: formData.description, status: formData.status @@ -117,17 +117,38 @@ export default function NewProjectPage() {
- +
+
+ + +
+ +
+ + +
-
- -
- - -
-
-