Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 1.修复可见效数据取值，2.修复设置可见效指定人员不成功

Browse Source
This commit is contained in:
weifashi
2023-12-26 20:52:03 +08:00
parent 67dafae9d6
commit fdc85bbcbf
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/ProjectTask.php
+7 -2
View File
@@ -288,7 +288,8 @@ class ProjectTask extends AbstractModel
->leftJoin('project_task_users', function ($leftJoin) use ($userid) {
$leftJoin
->on('project_task_users.userid', '=', DB::raw($userid))
->on('project_tasks.id', '=', 'project_task_users.task_id');
->on('project_tasks.id', '=', 'project_task_users.task_id')
->where('project_task_users.owner', '<', 2);
});
return $query;
}
@@ -309,7 +310,11 @@ class ProjectTask extends AbstractModel
'project_task_users.owner'
])
->selectRaw("1 AS assist")
->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_id')
->join('project_task_users', function ($leftJoin) {
$leftJoin
->on('project_tasks.id', '=', 'project_task_users.task_id')
->where('project_task_users.owner', '<', 2);
})
->where('project_task_users.userid', $userid);
if ($owner !== null) {
$query->where('project_task_users.owner', $owner);