更新

app/adminapi/logic/auth/MenuLogic.php

@@ -50,8 +50,10 @@ class MenuLogic extends BaseLogic
         $where[] = ['is_disable', '=', 0];
 
         if ($admin['root'] != 1) {
-            $roleMenu = SystemRoleMenu::whereIn('role_id', $admin['role_id'])->column('menu_id');
+            $roleMenu = SystemRoleMenu::whereIn('role_id', $admin['role_id'])->where('is_top', 1)->column('menu_id');
             $where[] = ['id', 'in', $roleMenu];
+        } else {
+            $where[] = ['pid', '=', 0];
         }
 
         $menu = SystemMenu::where($where)
@@ -61,6 +63,16 @@ class MenuLogic extends BaseLogic
         return linear_to_tree($menu, 'children');
     }
 
+    // public static function getPidMyList($pid){
+    //     $where = [];
+    //     $where[] = ['type', 'in', ['M', 'C']];
+    //     $where[] = ['is_disable', '=', 0];
+    //     $where[] = ['pid', '=', $pid];
+    //     $menu = SystemMenu::where($where)
+    //         ->order(['sort' => 'desc', 'id' => 'asc'])
+    //         ->select();
+
+    // }
 
     /**
      * @notes 添加菜单
@@ -98,9 +110,24 @@ class MenuLogic extends BaseLogic
      */
     public static function edit(array $params)
     {
+        $is_pid = true;
+        $pid=$params['pid'];
+        $model_name='';
+        if ($pid > 0) {
+            while ($is_pid==true) {
+                $find= SystemMenu::where('id', $pid)->field('id,pid,paths')->find();
+                if($find['pid']==0){
+                    $is_pid=false;
+                    $model_name=$find['paths'];
+                }else{
+                    $pid=$find['pid'];
+                }
+            }
+        }
         return SystemMenu::update([
             'id' => $params['id'],
             'pid' => $params['pid'],
+            'model_name' => $model_name,
             'type' => $params['type'],
             'name' => $params['name'],
             'icon' => $params['icon'] ?? '',
@@ -180,5 +207,4 @@ class MenuLogic extends BaseLogic
 
         return linear_to_tree($data, 'children');
     }
-
-}
+}

app/adminapi/logic/auth/RoleLogic.php

@@ -43,6 +43,7 @@ class RoleLogic extends BaseLogic
         Db::startTrans();
         try {
             $menuId = !empty($params['menu_id']) ? $params['menu_id'] : [];
+            $top_arr = !empty($params['top_arr']) ? $params['top_arr'] : [];
 
             $role = SystemRole::create([
                 'name' => $params['name'],
@@ -55,9 +56,17 @@ class RoleLogic extends BaseLogic
                 if (empty($item)) {
                     continue;
                 }
+                $is_top=0;
+                foreach ($top_arr as $top){
+                    if($top==$item){
+                        $is_top=1;
+                        break;
+                    }
+                }
                 $data[] = [
                     'role_id' => $role['id'],
                     'menu_id' => $item,
+                    'is_top' =>$is_top
                 ];
             }
             (new SystemRoleMenu)->insertAll($data);
@@ -84,6 +93,7 @@ class RoleLogic extends BaseLogic
         Db::startTrans();
         try {
             $menuId = !empty($params['menu_id']) ? $params['menu_id'] : [];
+            $top_arr = !empty($params['top_arr']) ? $params['top_arr'] : [];
 
             SystemRole::update([
                 'id' => $params['id'],
@@ -96,9 +106,17 @@ class RoleLogic extends BaseLogic
                 SystemRoleMenu::where(['role_id' => $params['id']])->delete();
                 $data = [];
                 foreach ($menuId as $item) {
+                    $is_top=0;
+                    foreach ($top_arr as $top){
+                        if($top==$item){
+                            $is_top=1;
+                            break;
+                        }
+                    }
                     $data[] = [
                         'role_id' => $params['id'],
                         'menu_id' => $item,
+                        'is_top' => $is_top
                     ];
                 }
                 (new SystemRoleMenu)->insertAll($data);