diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 4c654207..a72ceee6 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -1101,7 +1101,7 @@ class ProjectController extends AbstractController ])); $data = [ 'new_column' => $newColumn, - 'task' => ProjectTask::with(['taskUser', 'taskTag'])->find($task->id), + 'task' => ProjectTask::oneTask($task->id), ]; $task->pushMsg('add', $data); return Base::retSuccess('添加成功', $data); @@ -1141,7 +1141,7 @@ class ProjectController extends AbstractController ]); $data = [ 'new_column' => null, - 'task' => ProjectTask::with(['taskUser', 'taskTag'])->find($task->id), + 'task' => ProjectTask::oneTask($task->id), ]; $task->pushMsg('add', $data); return Base::retSuccess('添加成功', $data); @@ -1187,7 +1187,7 @@ class ProjectController extends AbstractController $updateSubTask = false; $task->updateTask($data, $updateProject, $updateContent, $updateSubTask); // - $data = ProjectTask::with(['taskUser', 'taskTag'])->find($task->id)->toArray(); + $data = ProjectTask::oneTask($task->id)->toArray(); $data['is_update_project'] = $updateProject; $data['is_update_content'] = $updateContent; $data['is_update_subtask'] = $updateSubTask; diff --git a/app/Models/Project.php b/app/Models/Project.php index f4cafb56..0f1c06f8 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -328,7 +328,7 @@ class Project extends AbstractModel } /** - * 根据用户获取项目信息(用于判断会员是否存在项目内) + * 获取项目信息(用于判断会员是否存在项目内) * @param int $project_id * @param null|bool $archived true:仅限未归档, false:仅限已归档, null:不限制 * @param null|bool $mustOwner true:仅限项目负责人, false:仅限非项目负责人, null:不限制 diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 09ebe035..ad4c67bb 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -870,7 +870,17 @@ class ProjectTask extends AbstractModel } /** - * 根据会员ID获取任务、项目信息(会员有任务权限 或 会员存在项目内) + * 获取任务 + * @param $task_id + * @return ProjectTask|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|object|null + */ + public static function oneTask($task_id) + { + return self::with(['taskUser', 'taskTag'])->allData()->where("project_tasks.id", intval($task_id))->first(); + } + + /** + * 获取任务(会员有任务权限 或 会员存在项目内) * @param int $task_id * @param bool $archived true:仅限未归档, false:不限制 * @param int|bool $mustOwner 0|false:不限制, 1|true:限制任务或项目负责人, 2:已有负责人才限制任务或项目负责人 diff --git a/database/seeders/ProjectTasksTableSeeder.php b/database/seeders/ProjectTasksTableSeeder.php index 47fcb2b7..e622db2f 100644 --- a/database/seeders/ProjectTasksTableSeeder.php +++ b/database/seeders/ProjectTasksTableSeeder.php @@ -78,7 +78,7 @@ class ProjectTasksTableSeeder extends Seeder 'project_id' => 2, 'column_id' => 2, 'dialog_id' => 0, - 'name' => '1', + 'name' => '新增职位需求', 'color' => '', 'desc' => '', 'start_at' => NULL, @@ -102,7 +102,7 @@ class ProjectTasksTableSeeder extends Seeder 'project_id' => 2, 'column_id' => 2, 'dialog_id' => 0, - 'name' => '11', + 'name' => '更新公司简介', 'color' => '', 'desc' => '', 'start_at' => NULL, @@ -1957,8 +1957,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '测试1', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:33:00'), + 'end_at' => seeders_at('2021-07-02 23:59:00'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => NULL, @@ -1981,8 +1981,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '测试2', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:33:00'), + 'end_at' => seeders_at('2021-07-02 23:59:00'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => NULL, @@ -2005,8 +2005,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '测试3', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:33:00'), + 'end_at' => seeders_at('2021-07-02 23:59:00'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => NULL, @@ -2077,8 +2077,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '首页', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:15:55'), + 'end_at' => seeders_at('2021-07-02 16:15:55'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => seeders_at('2021-07-01 16:17:30'), @@ -2101,8 +2101,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '公司介绍', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:15:55'), + 'end_at' => seeders_at('2021-07-02 16:15:55'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => seeders_at('2021-07-01 16:17:31'), @@ -2125,8 +2125,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '新闻动态', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:15:55'), + 'end_at' => seeders_at('2021-07-02 16:15:55'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => seeders_at('2021-07-01 16:17:32'), @@ -2149,8 +2149,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '产品介绍', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:15:55'), + 'end_at' => seeders_at('2021-07-02 16:15:55'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => seeders_at('2021-07-01 16:17:34'), @@ -2173,8 +2173,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '案例展示', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:15:55'), + 'end_at' => seeders_at('2021-07-02 16:15:55'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => seeders_at('2021-07-01 16:17:35'), @@ -2197,8 +2197,8 @@ class ProjectTasksTableSeeder extends Seeder 'name' => '联系我们', 'color' => '', 'desc' => '', - 'start_at' => NULL, - 'end_at' => NULL, + 'start_at' => seeders_at('2021-07-01 16:15:55'), + 'end_at' => seeders_at('2021-07-02 16:15:55'), 'archived_at' => NULL, 'archived_userid' => 0, 'complete_at' => NULL, diff --git a/electron/main.js b/electron/main.js index 1c8771da..b7b36542 100644 --- a/electron/main.js +++ b/electron/main.js @@ -54,7 +54,7 @@ function createMainWindow() { contextIsolation: false } }) - mainWindow.webContents.setUserAgent(mainWindow.webContents.getUserAgent() + " MainTaksWindow/1.0"); + mainWindow.webContents.setUserAgent(mainWindow.webContents.getUserAgent() + " MainTaskWindow/1.0"); if (devloadUrl) { mainWindow.loadURL(devloadUrl).then(r => {