From 668f8efe0c3074f360ff6d6435789b2647635aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Sat, 7 Feb 2026 14:36:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/views/soong_workflow_record.xml | 2 +-
 yuthon_hr_attendance/models/hr_attendance.py   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index a464daa07..b689689eb 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -236,7 +236,7 @@
             <field name="arch" type="xml">
                 <tree string="流程查询" action="open_record" type="object"
                       delete="false"
-                      create="false" default_order="write_date2 desc, id desc" expand="1" limit="10">
+                      create="false" default_order="display_end_time" expand="1" limit="10">
                     <header>
                         <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight"
                                 groups="soong_workflow.group_soong_workflow_manager"/>
diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index 91222d9ea..cef27d9c1 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -280,8 +280,10 @@ class HrAttendance(models.Model):
         for rec in attendance_records:
             emp = rec.employee_id
             emp_id = emp.id
-            if emp_id not in employee_abnormal:
-                employee_abnormal[emp_id] = {'abnormal_list': [], 'employee': emp}
+            resource_user_ids = emp.resource_calendar_id.resource_user_ids.ids
+            if emp_id not in resource_user_ids:
+                if emp_id not in employee_abnormal:
+                    employee_abnormal[emp_id] = {'abnormal_list': [], 'employee': emp}
 
             # 提取基础信息：日期（月-日）、班次
             att_date = rec.current_data

From b7e74e68312d8b454d8bce0a769b26a43fc7003a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Sat, 7 Feb 2026 14:38:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/hr_attendance.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index cef27d9c1..522781e5a 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -280,10 +280,11 @@ class HrAttendance(models.Model):
         for rec in attendance_records:
             emp = rec.employee_id
             emp_id = emp.id
-            resource_user_ids = emp.resource_calendar_id.resource_user_ids.ids
-            if emp_id not in resource_user_ids:
-                if emp_id not in employee_abnormal:
-                    employee_abnormal[emp_id] = {'abnormal_list': [], 'employee': emp}
+            resource_user_ids = emp.resource_calendar_id.resource_user_ids.ids if emp.resource_calendar_id else []
+            if emp_id in resource_user_ids:
+                continue
+            if emp_id not in employee_abnormal:
+                employee_abnormal[emp_id] = {'abnormal_list': [], 'employee': emp}
 
             # 提取基础信息：日期（月-日）、班次
             att_date = rec.current_data