diff --git a/Server/application/superadmin/controller/company/CreateCompanyController.php b/Server/application/superadmin/controller/company/CreateCompanyController.php index c6a1cd8a..2c623a4a 100644 --- a/Server/application/superadmin/controller/company/CreateCompanyController.php +++ b/Server/application/superadmin/controller/company/CreateCompanyController.php @@ -158,7 +158,7 @@ class CreateCompanyController extends BaseController ]; foreach ($seedCols as $seeds) { - $this->s2CreateUser(array_merge($params, ArrHelper::getValue('account,username', $seeds))); + $this->s2CreateUser (array_merge($params, ArrHelper::getValue('account,username', $seeds))); $this->ckbCreateUser(array_merge($params, $seeds)); } } @@ -172,7 +172,7 @@ class CreateCompanyController extends BaseController */ protected function ckbCreateUser(array $params): void { - $params = ArrHelper::getValue('username,account,password,companyId,s2_accountId,status,phone', $params); + $params = ArrHelper::getValue('username,account,password,companyId,s2_accountId,status,phone,isAdmin,typeId', $params); $params = array_merge($params, [ 'passwordLocal' => localEncrypt($params['password']), diff --git a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx index 88efa33a..b1413ab7 100644 --- a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx +++ b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx @@ -275,20 +275,20 @@ export default function EditProjectPage({ params }: { params: { id: string } })
| 设备名称 | -IMEI | -手机号 | -型号 | -品牌 | -状态 | -添加时间 | +设备名称 | +IMEI | +手机号 | +型号 | +品牌 | +状态 | +添加时间 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {device.memo} | -{device.imei || '-'} | +{device.imei || '-'} | {device.phone || '-'} | {device.model || '-'} | {device.brand || '-'} | diff --git a/SuperAdmin/app/dashboard/projects/[id]/page.tsx b/SuperAdmin/app/dashboard/projects/[id]/page.tsx index d0ac9f7c..28470f1e 100644 --- a/SuperAdmin/app/dashboard/projects/[id]/page.tsx +++ b/SuperAdmin/app/dashboard/projects/[id]/page.tsx @@ -342,7 +342,13 @@ export default function ProjectDetailPage({ params }: ProjectDetailPageProps) { {user.status === 1 ? "启用" : "禁用"} -