From da5e01e856c19e46fb7c16c93d31f973b0a5936b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= Date: Tue, 22 Apr 2025 09:54:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8E=E8=A7=A6=E5=AE=A2?= =?UTF-8?q?=E5=AE=9D=E6=95=B0=E6=8D=AE=E4=BA=A4=E6=8D=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/CreateCompanyController.php | 9 ++--- .../GetCompanyDetailForUpdateController.php | 3 +- .../company/UpdateCompanyController.php | 7 ++-- .../app/dashboard/projects/[id]/edit/page.tsx | 36 +++++++++---------- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/Server/application/superadmin/controller/company/CreateCompanyController.php b/Server/application/superadmin/controller/company/CreateCompanyController.php index 1df8db90..0925d9d9 100644 --- a/Server/application/superadmin/controller/company/CreateCompanyController.php +++ b/Server/application/superadmin/controller/company/CreateCompanyController.php @@ -93,7 +93,7 @@ class CreateCompanyController extends BaseController } return array_merge($params, [ - 'companyId' => $department['departmentId'], + 'companyId' => $department['departmentId'], 's2_accountId' => $department['id'], ]); } @@ -125,14 +125,15 @@ class CreateCompanyController extends BaseController protected function ckbCreateUser(array $params): void { $params = ArrHelper::getValue( - 'username,account,password=passwordLocal,companyId,s2_accountId,status,realName', + 'username,account,password,companyId,s2_accountId,status,realName', $params ); $result = UsersModel::create(array_merge($params, [ - 'passwordMd5' => md5($params['passwordLocal']), + 'passwordLocal' => localEncrypt($params['password']), + 'passwordMd5' => md5($params['password']), 'isAdmin' => 1, // 主要账号默认1 - 'typeId' => 1, // 类型：运营后台/操盘手传1、 门店传2 + 'typeId' => 1, // 类型：运营后台/操盘手传1、 门店传2 ])); if (!$result) { diff --git a/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php b/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php index b94ee404..10a3e782 100644 --- a/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php +++ b/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php @@ -39,7 +39,8 @@ class GetCompanyDetailForUpdateController extends BaseController { $detail = CompanyModel::alias('c') ->field([ - 'c.id', 'c.name', 'c.status', 'c.memo', 'c.companyId', 'u.account', 'u.username', 'u.phone', + 'c.id', 'c.name', 'c.status', 'c.memo', 'c.companyId', + 'u.account', 'u.username', 'u.phone', 'u.s2_accountId' ]) ->leftJoin('users u', 'c.companyId = u.companyId') ->find($id); diff --git a/Server/application/superadmin/controller/company/UpdateCompanyController.php b/Server/application/superadmin/controller/company/UpdateCompanyController.php index c87b7a73..c69e0468 100644 --- a/Server/application/superadmin/controller/company/UpdateCompanyController.php +++ b/Server/application/superadmin/controller/company/UpdateCompanyController.php @@ -84,11 +84,12 @@ class UpdateCompanyController extends BaseController */ protected function updateUserAccount(array $params): void { - $params = ArrHelper::getValue('username,account,password=passwordLocal,realName,status', $params); + $params = ArrHelper::getValue('username,account,password,realName,status', $params); $params = ArrHelper::rmValue($params); - if (isset($params['passwordLocal'])) { - $params['passwordMd5'] = md5($params['passwordLocal']); + if (isset($params['password'])) { + $params['passwordMd5'] = md5($params['password']); + $params['passwordLocal'] = localEncrypt($params['passwordLocal']); } $user = $this->getUserDetailByCompanyId(); diff --git a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx index 33d6e12e..02b7fa71 100644 --- a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx +++ b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx @@ -152,16 +152,14 @@ export default function EditProjectPage({ params }: { params: { id: string } })
- - + + setNickname(e.target.value)} + placeholder="用于账号登录后显示的用户名，可以填真实姓名" + required + />
@@ -199,14 +197,16 @@ export default function EditProjectPage({ params }: { params: { id: string } })
- - setNickname(e.target.value)} - placeholder="请输入昵称" - required - /> + +