dyjh 6 rokov pred
rodič
commit
1f8b4791af
1 zmenil súbory, kde vykonal 13 pridanie a 13 odobranie
  1. 13 13
      app/Models/AdminAccessModel.php

+ 13 - 13
app/Models/AdminAccessModel.php

@@ -51,23 +51,23 @@ class AdminAccessModel extends BaseModel
         if(is_string($roleIds)) {
         if(is_string($roleIds)) {
             $roleIds = explode(',', $roleIds);
             $roleIds = explode(',', $roleIds);
         }
         }
-        $info = $this->select('admin_menus.id',
-            'admin_menus.pid',
-            'admin_menus.path',
-            'admin_menus.name',
-            'admin_menus.ico',
-            'admin_menus.display',
-            'admin_menus.sort')
-            ->leftJoin('admin_menus', 'admin_access.menu_id', '=', 'admin_menus.id')
-            ->leftjoin("admin_roles","admin_access.role_id","=","admin_roles.id")
+        $info = $this->select('fanyun_admin_menus.id',
+            'fanyun_admin_menus.pid',
+            'fanyun_admin_menus.path',
+            'fanyun_admin_menus.name',
+            'fanyun_admin_menus.ico',
+            'fanyun_admin_menus.display',
+            'fanyun_admin_menus.sort')
+            ->leftJoin('fanyun_admin_menus', 'fanyun_admin_access.menu_id', '=', 'fanyun_admin_menus.id')
+            ->leftjoin("fanyun_admin_roles","fanyun_admin_access.role_id","=","fanyun_admin_roles.id")
             ->whereIn('role_id',$roleIds)
             ->whereIn('role_id',$roleIds)
-            ->where("admin_roles.status",1);
+            ->where("fanyun_admin_roles.status",1);
         if($isMenu) {
         if($isMenu) {
-            $info = $info->where("admin_menus.display",1);
+            $info = $info->where("fanyun_admin_menus.display",1);
         }
         }
         $info = $info
         $info = $info
-            ->orderBy('admin_menus.sort', 'desc')->orderBy('admin_menus.id', 'asc')
-            ->groupby(\DB::raw("admin_menus.id"))
+            ->orderBy('fanyun_admin_menus.sort', 'desc')->orderBy('fanyun_admin_menus.id', 'asc')
+            ->groupby(\DB::raw("fanyun_admin_menus.id"))
             ->get();
             ->get();
         return $info->toArray();
         return $info->toArray();
     }
     }