Browse Source

项目任务团队用户权限限制调整

kely 7 months ago
parent
commit
a435bdb246

+ 10 - 10
app/Http/Controllers/API/ProjectController.php

@@ -194,7 +194,7 @@ class ProjectController extends Controller
     {
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -242,7 +242,7 @@ class ProjectController extends Controller
     {
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -257,7 +257,7 @@ class ProjectController extends Controller
     {
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -278,7 +278,7 @@ class ProjectController extends Controller
     {
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -300,7 +300,7 @@ class ProjectController extends Controller
     {
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -328,7 +328,7 @@ class ProjectController extends Controller
     {
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -352,7 +352,7 @@ class ProjectController extends Controller
         $requirementIds = $request->get("requirement_id",[]);
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -391,7 +391,7 @@ class ProjectController extends Controller
         $requirementIds = $request->get("requirement_id",[]);
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -419,7 +419,7 @@ class ProjectController extends Controller
     {
         $isAction=true;
         $project = Project::allowed($id,$isAction)->find($id);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -487,7 +487,7 @@ class ProjectController extends Controller
     {
         $isAction=true;
         $project = Project::allowed($projectId,$isAction)->find($projectId);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
         $oldAssetId=$project->assets()->select('assets.id')->pluck('id');

+ 13 - 13
app/Http/Controllers/API/TaskController.php

@@ -72,7 +72,7 @@ class TaskController extends Controller
         $isAction=true;
         $projectId=$request->get("project_id");
         $project = Project::allowed($projectId,$isAction)->find($projectId);
-        if($project == null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
 
@@ -133,7 +133,7 @@ class TaskController extends Controller
     {
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
         $task->status = TaskStatus::DOING->value;
@@ -154,7 +154,7 @@ class TaskController extends Controller
     {
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
 
@@ -175,7 +175,7 @@ class TaskController extends Controller
     {
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
 
@@ -196,7 +196,7 @@ class TaskController extends Controller
     {
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
 
@@ -222,7 +222,7 @@ class TaskController extends Controller
     {
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
 
@@ -247,7 +247,7 @@ class TaskController extends Controller
     public function  wait(Request $request,string $id){
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
         $task->status=TaskStatus::WAIT->value;
@@ -268,7 +268,7 @@ class TaskController extends Controller
     public function assign(AssignRequest $request,string $id){
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
         $task->fill([
@@ -295,7 +295,7 @@ class TaskController extends Controller
     {
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
 
@@ -330,7 +330,7 @@ class TaskController extends Controller
     {
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
 
@@ -346,7 +346,7 @@ class TaskController extends Controller
         $isAction=true;
         $projectId=$request->get("project_id");
         $project = Project::allowed($projectId,$isAction)->find($projectId);
-        if($project==null){
+        if($project===null||is_null($project)){
             return $this->badRequest('Permission denied or project not found. Please contact the administrator.');
         };
         $parsedItems = [];
@@ -416,7 +416,7 @@ class TaskController extends Controller
     {
         $isAction=true;
         $task = Task::query()->allowed($id,$isAction)->find($id);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };
 
@@ -452,7 +452,7 @@ class TaskController extends Controller
         $taskId=$taskContainer->task_id;
         $isAction=true;
         $task = Task::query()->allowed($taskId,$isAction)->find($taskId);
-        if($task==null){
+        if($task===null||is_null($task)){
             return $this->badRequest('Permission denied or task not found. Please contact the administrator.');
         };