1

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -1296,7 +1296,7 @@
         tg.`name` AS groupName,s.`stages_name` AS stageName FROM report r
         LEFT JOIN `user` u ON r.`creator_id`=u.`id`
         LEFT JOIN project p ON r.`project_id`=p.`id`
-        LEFT JOIN task_group tg ON tg.`project_id`=r.`group_id`
+        LEFT JOIN task_group tg ON tg.`id`=r.`group_id`
         LEFT JOIN stages s ON s.`project_id`=p.id AND s.`group_id`=tg.`id`
         LEFT JOIN department d ON d.`department_id`=u.`department_id`
         WHERE r.company_id=#{companyId}
@@ -1322,7 +1322,7 @@
         SELECT r.id AS reportId FROM report r
         LEFT JOIN `user` u ON r.`creator_id`=u.`id`
         LEFT JOIN project p ON r.`project_id`=p.`id`
-        LEFT JOIN task_group tg ON tg.`project_id`=r.`group_id`
+        LEFT JOIN task_group tg ON tg.`id`=r.`group_id`
         LEFT JOIN stages s ON s.`project_id`=p.id AND s.`group_id`=tg.`id`
         LEFT JOIN department d ON d.`department_id`=u.`department_id`
         WHERE r.company_id=#{companyId}