|
@@ -2910,7 +2910,7 @@
|
|
|
LEFT JOIN task_group tg ON tg.id=t.group_id
|
|
|
LEFT JOIN project p ON t.project_id=p.id
|
|
|
LEFT JOIN task_daily_allocate daily ON daily.`task_id` = t.id
|
|
|
- LEFT JOIN USER u ON u.id= daily.`user_id`
|
|
|
+ LEFT JOIN user u ON u.id= daily.`user_id`
|
|
|
LEFT JOIN department ON department.department_id = u.department_id
|
|
|
LEFT JOIN task_executor te ON te.task_id = daily.`task_id` AND te.`executor_id` = daily.`user_id`
|
|
|
WHERE u.company_id=#{companyId}
|
|
@@ -2938,7 +2938,7 @@
|
|
|
LEFT JOIN task_group tg ON tg.id=t.group_id
|
|
|
LEFT JOIN project p ON t.project_id=p.id
|
|
|
LEFT JOIN task_daily_allocate daily ON daily.`task_id` = t.id
|
|
|
- LEFT JOIN USER u ON u.id= daily.`user_id`
|
|
|
+ LEFT JOIN user u ON u.id= daily.`user_id`
|
|
|
LEFT JOIN department ON department.department_id = u.department_id
|
|
|
LEFT JOIN task_executor te ON te.task_id = daily.`task_id` AND te.`executor_id` = daily.`user_id`
|
|
|
WHERE u.company_id=#{companyId}
|