From 514f353449ee70b6547ce891fc467334d5fce18c Mon Sep 17 00:00:00 2001
From: umono <umono.life@gmail.com>
Date: Mon, 19 Dec 2022 21:44:06 +0800
Subject: [PATCH] fix some

---
 src/common/models/admin/AdminGroup.php               |  4 ++++
 .../migrations/m180601_035116_create_admin_table.php | 12 ++++++++++--
 .../backend/api/controllers/TestController.php       |  2 +-
 src/modules/backend/api/helpers/MenuDataHelper.php   |  2 +-
 ui/src/views/Admin/admin-group/components/form.vue   |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/common/models/admin/AdminGroup.php b/src/common/models/admin/AdminGroup.php
index 9340e2e..ef8ca68 100644
--- a/src/common/models/admin/AdminGroup.php
+++ b/src/common/models/admin/AdminGroup.php
@@ -18,6 +18,10 @@
         public $isSaveLog = false;
         public const PERMISSIONS_CACHE_PREFIX = 'ADMIN_GROUP_PERMISSIONS_';
         public $permissions;
+        public function behaviors()
+        {
+            return [];
+        }
 
         public static function tableName()
         {
diff --git a/src/database/migrations/m180601_035116_create_admin_table.php b/src/database/migrations/m180601_035116_create_admin_table.php
index efe0fcc..b067ab4 100644
--- a/src/database/migrations/m180601_035116_create_admin_table.php
+++ b/src/database/migrations/m180601_035116_create_admin_table.php
@@ -100,7 +100,7 @@
             $this->createIndex('sort', $this->adminMenuTableName, 'sort');
 
             // 写入数据
-            $this->batchInsert($this->adminGroupTableName, ['name'], [['开发部']]);
+            //$this->batchInsert($this->adminGroupTableName, ['name'], [['开发部']]);
 
             $this->batchInsert(
                 $this->adminTableName, [
@@ -124,11 +124,19 @@
                 ]);
 
             // 导入菜单数据
+            $menuArr = MenuDataHelper::backAll();
             $this->batchInsert(
                 $this->adminMenuTableName,
                 MenuDataHelper::getColumnArr(),
-                MenuDataHelper::backAll()
+                $menuArr,
             );
+
+            $menuKeys = array_slice(array_column($menuArr,4),3);
+            $adminGroup              = new \app\common\models\admin\AdminGroup();
+            $adminGroup->name        = '开发部';
+            $adminGroup->permissions = $menuKeys;
+
+            $adminGroup->save(false);
         }
 
         /**
diff --git a/src/modules/backend/api/controllers/TestController.php b/src/modules/backend/api/controllers/TestController.php
index b64e778..c460606 100644
--- a/src/modules/backend/api/controllers/TestController.php
+++ b/src/modules/backend/api/controllers/TestController.php
@@ -3,12 +3,12 @@
     namespace app\modules\backend\api\controllers;
 
     use app\modules\backend\api\Controller;
+    use app\modules\backend\api\helpers\MenuDataHelper;
     use \umono\multiple\helpers\DeleteHelper;
 
     class TestController extends Controller
     {
         public function actionIndex()
         {
-            return DeleteHelper::$bind;
         }
     }
\ No newline at end of file
diff --git a/src/modules/backend/api/helpers/MenuDataHelper.php b/src/modules/backend/api/helpers/MenuDataHelper.php
index 86ccca7..3749497 100644
--- a/src/modules/backend/api/helpers/MenuDataHelper.php
+++ b/src/modules/backend/api/helpers/MenuDataHelper.php
@@ -60,7 +60,7 @@
                 [27, '菜单数据导出全部', 2, '导出全部数据', 'menu/export-all', 8, null, null, 1, $time, $time],
 
                 [28, '用户管理', 0, null, 'user', 0, 6, 'People24Filled', 1, $time, $time],
-                [29, '用户列表', 1, '用户列表数据', 'user/index', 17, 0, null, 1, $time, $time],
+                [29, '用户列表', 1, '用户列表数据', 'user/index', 28, 0, null, 1, $time, $time],
             ];
         }
     }
\ No newline at end of file
diff --git a/ui/src/views/Admin/admin-group/components/form.vue b/ui/src/views/Admin/admin-group/components/form.vue
index 47af998..221865a 100644
--- a/ui/src/views/Admin/admin-group/components/form.vue
+++ b/ui/src/views/Admin/admin-group/components/form.vue
@@ -19,7 +19,7 @@
                                             <div class="label">
                                                 {{ item.name }}
                                                 <span
-                                                    :class="item.own == item.sumRole ? 'bg-green-500 text-white' : 'bg-stone-100'">
+                                                    :class="item.sumRole != 0 && item.own == item.sumRole ? 'bg-green-500 text-white' : 'bg-stone-100'">
                                                     {{ item.own }}/{{ item.sumRole }}
                                                 </span>
                                             </div>