Browse Source

解决plan全局公司权限报错

kely 7 months ago
parent
commit
de8a847e17
2 changed files with 2 additions and 2 deletions
  1. 1 1
      app/Models/Plan.php
  2. 1 1
      routes/api.php

+ 1 - 1
app/Models/Plan.php

@@ -32,7 +32,7 @@ class Plan extends Model
 
     public function scopeAllowed(Builder $query) : void
     {
-         $planIds = Plan::query()->leftJoin("assets", "plans.asset_id", "=", "assets.id")
+         $planIds = Plan::query()->withoutGlobalScope(CompanyScope::class)->leftJoin("assets", "plans.asset_id", "=", "assets.id")
              ->where(function ($query){
              $query->where('assets.acl', AssetACL::PRIVATE->value)
                  ->where('assets.owner', Auth::id());

+ 1 - 1
routes/api.php

@@ -63,6 +63,7 @@ Route::middleware(['auth:sanctum','account.limit'])->group(function () {
     Route::get("project-requirementGroups-tree/{asset_id}", [API\ProjectController::class, "projectRequirementGroupsTree"]);
     Route::get("project/{project}/not-link-asset-requirement", [API\ProjectController::class, "notLinkAssetRequirement"]);
     Route::get("library-linkage/{type}", [API\LibraryController::class, "linkage"]);
+    Route::get("project/{project}/latest-dynamic", [API\ProjectController::class, "latestDynamic"]);
 
     // Allow access only to admin role
     Route::middleware(['permission', 'role.super-admin', 'system.operation-log'])->group(function () {
@@ -150,7 +151,6 @@ Route::middleware(['auth:sanctum','account.limit'])->group(function () {
 
 
         Route::get("project/{project}/dynamic", [API\ProjectController::class, "dynamic"])->name("project.dynamic");
-        Route::get("project/{project}/latest-dynamic", [API\ProjectController::class, "latestDynamic"])->name("project.latest-dynamic");
         Route::get("project/{project}/kanban", [API\ProjectController::class, "kanban"])->name("project.kanban");
         Route::get("project/{project}/group-view", [API\ProjectController::class, "groupView"])->name("project.group-view");
         Route::get("project/{project}/gantt", [API\ProjectController::class, "gantt"])->name("project.gantt");