From 2c1ef32db15e5a5ca3bdc6884fee38b85a43e5f0 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Fri, 19 Jan 2024 11:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/InstitutionController.php    |  8 ++++----
 app/Services/Admin/InstitutionService.php          |  2 ++
 ...2024_01_16_181146_create_institutions_table.php |  2 +-
 lang/zh_CN/admin.php                               | 14 +++++++-------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/Admin/Controllers/InstitutionController.php b/app/Admin/Controllers/InstitutionController.php
index 584e99a..2117b9e 100644
--- a/app/Admin/Controllers/InstitutionController.php
+++ b/app/Admin/Controllers/InstitutionController.php
@@ -31,12 +31,12 @@ class InstitutionController extends AdminController
                 amis()->TableColumn()->make()->name('id')->label('ID')->sortable(true),
                 amis()->TableColumn('parent.name', __('admin.institutions.parent')),
                 amis()->TableColumn('name', __('admin.institutions.name')),
-                amis()->TableColumn('code', __('admin.institutions.code'))->copyable(true),
-                amis()->TableColumn('type.name', __('admin.institutions.type'))->className('text-primary'),
+                // amis()->TableColumn('code', __('admin.institutions.code'))->copyable(true),
+                // amis()->TableColumn('type.name', __('admin.institutions.type'))->className('text-primary'),
                 amis()->TableColumn('address', __('admin.institutions.address')),
                 amis()->TableColumn('person.name', __('admin.institutions.person')),
                 amis()->TableColumn('sort', __('admin.institutions.sort')),
-				amis()->TableColumn('created_at', __('admin.created_at'))->type('datetime')->sortable(true),
+				// amis()->TableColumn('created_at', __('admin.created_at'))->type('datetime')->sortable(true),
                 amisMake()->Operation()->label(__('admin.actions'))->buttons([
                     $this->rowEditButton(true, 'md'),
                     $this->rowDeleteButton(),
@@ -55,7 +55,7 @@ class InstitutionController extends AdminController
             amis()->TextControl('code', __('admin.institutions.code')),
             amis()->TextControl('address', __('admin.institutions.address')),
             amis()->SelectControl('person_id', __('admin.institutions.person'))->options([]),//搜索人-todo,
-            Components::make()->sortControl('sort', __('admin.institutions.sort')),
+            // Components::make()->sortControl('sort', __('admin.institutions.sort')),
         ]);
     }
 
diff --git a/app/Services/Admin/InstitutionService.php b/app/Services/Admin/InstitutionService.php
index 5ac9384..7a7d34d 100644
--- a/app/Services/Admin/InstitutionService.php
+++ b/app/Services/Admin/InstitutionService.php
@@ -16,6 +16,8 @@ class InstitutionService extends BaseService
 
     protected string $modelFilterName = InstitutionFilter::class;
 
+    protected array $withRelationships = ['parent'];
+
     public function getTree()
     {
         $list = $this->query()->filter(request()->all(), $this->modelFilterName)->orderByDesc('sort')->get();
diff --git a/database/migrations/2024_01_16_181146_create_institutions_table.php b/database/migrations/2024_01_16_181146_create_institutions_table.php
index 895be42..75ed9d9 100644
--- a/database/migrations/2024_01_16_181146_create_institutions_table.php
+++ b/database/migrations/2024_01_16_181146_create_institutions_table.php
@@ -15,7 +15,7 @@ return new class extends Migration
             $table->id();
             $table->string('name')->comment('名字');
             $table->string('code')->nullable()->comment('简码');
-            $table->unsignedBigInteger('parent_id')->nullable()->comment('上级');
+            $table->unsignedBigInteger('parent_id')->nullable()->default(0)->comment('上级');
             $table->unsignedBigInteger('type_id')->nullable()->comment('属性：keywords.id');
             $table->string('address')->nullable()->comment('地址');
             $table->unsignedBigInteger('person_id')->nullable()->comment('负责人：persons.id');
diff --git a/lang/zh_CN/admin.php b/lang/zh_CN/admin.php
index 803066f..a50fa39 100644
--- a/lang/zh_CN/admin.php
+++ b/lang/zh_CN/admin.php
@@ -309,13 +309,13 @@ return [
         ],
     ],
     'institutions' => [
-        'name' => '名称',
-        'code' => '简码',
-        'parent' => '上级',
-        'parent_id' => '上级',
-        'type' => '属性',
-        'type_id' => '属性',
-        'address' => '地址',
+        'name' => '组织名称',
+        'code' => '组织简码',
+        'parent' => '上级组织',
+        'parent_id' => '上级组织',
+        'type' => '组织属性',
+        'type_id' => '组织属性',
+        'address' => '组织地址',
         'person' => '负责人',
         'person_id' => '负责人',
         'sort' => '排序',