日程

yuthon_will_task/controllers/main.py

@@ -86,14 +86,23 @@ class YuthonWillTask(http.Controller):
         users_id = int(kwargs.get('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])]
         logger.info(f"{kwargs}")
         logger.info(f"{kwargs}")
         logger.info(f"{kwargs}")
+        
+        # 获取当前用户及其公司信息
+        user = request.env['res.users'].sudo().browse(users_id)
+        user_company_id = user.company_id.id
+        
         if _filter == 'leader':
-            domain = [('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理', '部门副经理', '副总经理', '司机'])]
+            # 领导过滤：只能看到自己公司的领导
+            domain = [
+                ('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理', '部门副经理', '副总经理', '司机']),
+                ('company_id', '=', user_company_id)
+            ]
             # expression.AND([domain, get_is_leader_domain(True)])
         else:
             domain = expression.AND([domain, get_is_leader_domain(False)])