From eb8525b352815387d42ee2048b10cb6036740b7b Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Thu, 20 Apr 2023 10:28:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Permissions/Http/Controllers/RolesController.php   | 10 +++++-----
 modules/Permissions/config/ok.php                      |  4 ----
 modules/Permissions/config/oks.php                     |  4 ----
 modules/Permissions/views/roles/form/create.vue        |  1 +
 4 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 modules/Permissions/config/ok.php
 delete mode 100644 modules/Permissions/config/oks.php

diff --git a/modules/Permissions/Http/Controllers/RolesController.php b/modules/Permissions/Http/Controllers/RolesController.php
index b5084c7..24dd228 100644
--- a/modules/Permissions/Http/Controllers/RolesController.php
+++ b/modules/Permissions/Http/Controllers/RolesController.php
@@ -57,7 +57,7 @@ class RolesController extends Controller
     {
         $role = $this->model->firstBy($id);
 
-        $role->setAttribute('permissions', $role->permissions()->get()->toTree());
+        $role->setAttribute('permissions', $role->permissions()->get()->pluck('id'));
 
         $role->setAttribute('departments', $role->departments()->pluck('id'));
 
@@ -72,13 +72,13 @@ class RolesController extends Controller
      */
     public function update($id, RoleRequest $request)
     {
-        $dataRange = $request->get('data_range');
+        $data = $request->all();
 
-        if ($dataRange && ! DataRange::Personal_Choose->assert($request->get('data_range'))) {
-            $request['departments'] = [];
+        if ($request->get('data_range') && ! DataRange::Personal_Choose->assert($data['data_range'])) {
+            $data['departments'] = [];
         }
 
-        return $this->model->updateBy($id, $request->all());
+        return $this->model->updateBy($id,$data);
     }
 
     /**
diff --git a/modules/Permissions/config/ok.php b/modules/Permissions/config/ok.php
deleted file mode 100644
index 5d27f3e..0000000
--- a/modules/Permissions/config/ok.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return [
-    'is_ok' => true
-];
diff --git a/modules/Permissions/config/oks.php b/modules/Permissions/config/oks.php
deleted file mode 100644
index 5d27f3e..0000000
--- a/modules/Permissions/config/oks.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return [
-    'is_ok' => true
-];
diff --git a/modules/Permissions/views/roles/form/create.vue b/modules/Permissions/views/roles/form/create.vue
index 4f668bf..e4e0840 100644
--- a/modules/Permissions/views/roles/form/create.vue
+++ b/modules/Permissions/views/roles/form/create.vue
@@ -193,6 +193,7 @@ beforeUpdate.value = () => {
   formData.value.permissions.forEach(item => {
     permissionIds.push(item)
   })
+
   formData.value.permissions = permissionIds
   formData.value.parent_id = getParent(formData.value.parent_id)
 }