diff --git a/yuthon_will_task/controllers/main.py b/yuthon_will_task/controllers/main.py index 96f0dd70a..51d5e9402 100644 --- a/yuthon_will_task/controllers/main.py +++ b/yuthon_will_task/controllers/main.py @@ -89,12 +89,12 @@ class YuthonWillTask(http.Controller): state = kwargs.get('state') order = 'task_datetime desc' if state == 'done' else 'task_datetime ace' - domain = [('users_ids', 'in', [users_id]), ('company_id', '=', employee_id.company_id.id)] + domain = [('users_ids', 'in', [users_id])] logger.info(f"{kwargs}") logger.info(f"{kwargs}") logger.info(f"{kwargs}") if _filter == 'leader': - domain = [('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理', '部门副经理', '副总经理', '司机'])] + domain = [('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理', '部门副经理', '副总经理', '司机']), ('company_id', '=', employee_id.company_id.id)] # expression.AND([domain, get_is_leader_domain(True)]) else: domain = expression.AND([domain, get_is_leader_domain(False)])