diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index e0df1fc74..426591f2f 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -856,16 +856,15 @@ class SoongWorkflowRecord(models.Model): if not menu_id: return target_url = f'https://oa.thtzjt.com/web#aciton=4299&model=soong.workflow.record&view_type=list&cids=1-2-3-4&menu_id={menu_id.id}' - active_employees = self.env['hr.employee'].search([('name', '=', '林思敏')]) + active_employees = self.env['hr.employee'].search([('user_state', '=', 'in')]) if not active_employees: return - # 映射1:员工ID → 关联的用户ID(hr.employee的user_id字段) emp_to_user = {emp.id: emp.user_id.id for emp in active_employees if emp.user_id} active_employee_ids = set(emp_to_user.keys()) - + active_user_ids = list(emp_to_user.values()) record_ids = self.env["soong.workflow.record"].search([ - ('employee_ids', 'in', list(active_employee_ids)), + ('users_ids', 'in', active_user_ids), ('approve_state', 'in', ['pending', 'end']), ('reclaim_state', '=', False) ]) @@ -936,19 +935,17 @@ class SoongWorkflowRecord(models.Model): continue desc_parts = [] - if task_stats['普件'] > 0: - desc_parts.append(f"{task_stats['普件']}条普件") - if task_stats['急件'] > 0: - desc_parts.append(f"{task_stats['急件']}条急件") if task_stats['特急件'] > 0: desc_parts.append(f"{task_stats['特急件']}条特急件") - + if task_stats['急件'] > 0: + desc_parts.append(f"{task_stats['急件']}条急件") + if task_stats['普件'] > 0: + desc_parts.append(f"{task_stats['普件']}条普件") description = f"您有{('、'.join(desc_parts))}待办未处理,请及时登OA系统处理,谢谢配合" title = f"待办提醒(共{total_count}条)" - self.sudo().env["wecom.apps"].sync_send_message_textcard( category='oa', - user_id='18562027762', + user_id=emp.wecom_userid, title=title, description=description, url=target_url,