1

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

@@ -1914,7 +1914,7 @@
         LEFT JOIN task t ON tg.id = t.group_id
         LEFT JOIN task_executor te ON t.id = te.task_id
         LEFT JOIN user u
-        ON te.executor_id = u.id
+        ON te.executor_id = u.id AND u.`company_id`=#{companyId}
         LEFT JOIN project p ON p.id=tg.project_id
         LEFT JOIN department d ON d.department_id=u.department_id
         LEFT JOIN (
@@ -1947,7 +1947,7 @@
         LEFT JOIN task t ON tg.id = t.group_id
         LEFT JOIN task_executor te ON t.id = te.task_id
         LEFT JOIN `user` u
-        ON te.executor_id = u.id
+        ON te.executor_id = u.id AND u.`company_id`=#{companyId}
         LEFT JOIN project p ON p.id=tg.project_id
         LEFT JOIN department d ON d.department_id=u.department_id
         LEFT JOIN (