Quellcode durchsuchen

$project->id 改为 $project->uid , 添加creator_id

visuddhinanda vor 1 Jahr
Ursprung
Commit
e4b5b6a898

+ 4 - 2
api-v8/app/Http/Controllers/TaskController.php

@@ -45,9 +45,9 @@ class TaskController extends Controller
                 $table = Task::where('owner_id', $user['user_uid']);
                 $table = Task::where('owner_id', $user['user_uid']);
                 break;
                 break;
             case 'project':
             case 'project':
-                $projects = Project::where('id', $request->get('project_id'))
+                $projects = Project::where('uid', $request->get('project_id'))
                     ->orWhereJsonContains('path', $request->get('project_id'))
                     ->orWhereJsonContains('path', $request->get('project_id'))
-                    ->select('id')
+                    ->select('uid')
                     ->get();
                     ->get();
                 $table = Task::whereIn('project_id', $projects);
                 $table = Task::whereIn('project_id', $projects);
                 break;
                 break;
@@ -155,9 +155,11 @@ class TaskController extends Controller
             ],
             ],
             [
             [
                 'owner_id' => $studioId,
                 'owner_id' => $studioId,
+                'creator_id' => $user['user_uid'],
                 'project_id' => $request->get('project_id'),
                 'project_id' => $request->get('project_id'),
             ],
             ],
         );
         );
+
         if (Str::isUuid($request->get('id'))) {
         if (Str::isUuid($request->get('id'))) {
             $new->id = $request->get('id');
             $new->id = $request->get('id');
         } else {
         } else {

+ 4 - 3
api-v8/app/Http/Controllers/TaskGroupController.php

@@ -49,10 +49,10 @@ class TaskGroupController extends Controller
         }
         }
         $projectsId = array_keys($id);
         $projectsId = array_keys($id);
         //鉴权
         //鉴权
-        $projects = Project::whereIn('id', $projectsId)
-            ->select(['id', 'owner_id'])->get();
+        $projects = Project::whereIn('uid', $projectsId)
+            ->select(['uid', 'owner_id'])->get();
         foreach ($projects as $key => $project) {
         foreach ($projects as $key => $project) {
-            $id[$project->id] = $project->owner_id;
+            $id[$project->uid] = $project->owner_id;
             if (!TaskController::canEdit($user['user_uid'], $project->owner_id)) {
             if (!TaskController::canEdit($user['user_uid'], $project->owner_id)) {
                 Log::error(__('auth.failed'), ['user' => $user['user_uid'], 'owner' => $project->owner_id]);
                 Log::error(__('auth.failed'), ['user' => $user['user_uid'], 'owner' => $project->owner_id]);
                 return $this->error(__('auth.failed'), 403, 403);
                 return $this->error(__('auth.failed'), 403, 403);
@@ -83,6 +83,7 @@ class TaskGroupController extends Controller
                     'project_id' => $project['project_id'],
                     'project_id' => $project['project_id'],
                     'owner_id' => $id[$project['project_id']],
                     'owner_id' => $id[$project['project_id']],
                     'editor_id' => $user['user_uid'],
                     'editor_id' => $user['user_uid'],
+                    'creator_id' => $user['user_uid'],
                     'created_at' => now(),
                     'created_at' => now(),
                     'updated_at' => now(),
                     'updated_at' => now(),
                 ];
                 ];