diff --git a/yuthon_will_task/controllers/main.py b/yuthon_will_task/controllers/main.py
index eb3cc179a..96f0dd70a 100644
--- a/yuthon_will_task/controllers/main.py
+++ b/yuthon_will_task/controllers/main.py
@@ -84,11 +84,12 @@ class YuthonWillTask(http.Controller):
     def will_task_list(self, **kwargs):
         start = int(kwargs.get('start'))
         users_id = int(kwargs.get('users_id'))
+        employee_id = request.env['hr.employee'].sudo().search([('user_id', '=', users_id)])
         _filter = kwargs.get('filter')
         state = kwargs.get('state')
-        order = 'task_datetime desc' if state == 'done' else 'task_datetime desc'
+        order = 'task_datetime desc' if state == 'done' else 'task_datetime ace'
 
-        domain = [('users_ids', 'in', [users_id])]
+        domain = [('users_ids', 'in', [users_id]), ('company_id', '=', employee_id.company_id.id)]
         logger.info(f"{kwargs}")
         logger.info(f"{kwargs}")
         logger.info(f"{kwargs}")