From b1d36bcbbb7abfd90bc6f8ce90caf4815c81f4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= <eison.icu@gmail.com>
Date: Fri, 18 Apr 2025 15:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=AE=A1=E5=90=8E=E5=8F=B0=20-=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Server/application/common/model/Device.php    |  4 ++++
 .../GetCompanyDetailForUpdateController.php   | 23 +++++++++++++++++--
 .../app/dashboard/projects/new/page.tsx       |  4 ++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Server/application/common/model/Device.php b/Server/application/common/model/Device.php
index a186b65e..84515878 100644
--- a/Server/application/common/model/Device.php
+++ b/Server/application/common/model/Device.php
@@ -3,12 +3,15 @@
 namespace app\common\model;
 
 use think\Model;
+use think\model\concern\SoftDelete;
 
 /**
  * 设备模型类
  */
 class Device extends Model
 {
+    use SoftDelete;
+
     // 设置表名
     protected $name = 'device';
 
@@ -16,4 +19,5 @@ class Device extends Model
     protected $autoWriteTimestamp = true;
     protected $createTime = 'createTime';
     protected $updateTime = 'updateTime';
+    protected $deleteTime = 'deleteTime';
 } 
\ No newline at end of file
diff --git a/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php b/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
index 0e75ba8b..12dc5921 100644
--- a/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
+++ b/Server/application/superadmin/controller/company/GetCompanyDetailForUpdateController.php
@@ -3,6 +3,7 @@
 namespace app\superadmin\controller\company;
 
 use app\common\model\Company as CompanyModel;
+use app\common\model\Device as DeviceModel;
 use app\superadmin\controller\BaseController;
 
 /**
@@ -10,6 +11,23 @@ use app\superadmin\controller\BaseController;
  */
 class GetCompanyDetailForUpdateController extends BaseController
 {
+    /**
+     * 根据 CompanyId 获取设备列表
+     *
+     * @param int $companyId
+     * @return array
+     */
+    protected function getDevicesByCompanyId(int $companyId): array
+    {
+        return DeviceModel::alias('d')
+            ->field([
+                'd.id', 'd.memo',
+            ])
+            ->where('companyId', $companyId)
+            ->select()
+            ->toArray() ?: [];
+    }
+
     /**
      * 获取下古墓详情
      *
@@ -21,7 +39,7 @@ class GetCompanyDetailForUpdateController extends BaseController
     {
         $detail = CompanyModel::alias('c')
             ->field([
-                'c.id', 'c.name', 'c.status', 'c.memo', 'u.account', 'u.username', 'u.realName',
+                'c.id', 'c.name', 'c.status', 'c.memo', 'c.companyId', 'u.account', 'u.username', 'u.realName',
             ])
             ->leftJoin('users u', 'c.companyId = u.companyId')
             ->find($id);
@@ -43,11 +61,12 @@ class GetCompanyDetailForUpdateController extends BaseController
     {
         try {
             $data = $this->getCompanyDetail($id);
+            $devices = $this->getDevicesByCompanyId($data['companyId']);
 
             return json([
                 'code' => 200,
                 'msg' => '获取成功',
-                'data' => $data
+                'data' => array_merge($data, compact('devices')),
             ]);
         } catch (\Exception $e) {
             return json([
diff --git a/SuperAdmin/app/dashboard/projects/new/page.tsx b/SuperAdmin/app/dashboard/projects/new/page.tsx
index e5955d53..79920898 100644
--- a/SuperAdmin/app/dashboard/projects/new/page.tsx
+++ b/SuperAdmin/app/dashboard/projects/new/page.tsx
@@ -64,9 +64,9 @@ export default function NewProjectPage() {
           account: formData.account,
           password: formData.password,
           realName: formData.realName,
-          nickname: formData.nickname,
+          username: formData.nickname,
           description: formData.description,
-          status: formData.status // 添加状态参数
+          status: formData.status
         }),
       })