From 0e8a6ebb69d587d3c0e20bb0c717e05efb7028ae 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: Mon, 17 Nov 2025 11:45:34 +0800
Subject: [PATCH] =?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/yuthon_vacation_reports.py | 6 +++---
yuthon_hr_attendance/views/attendance_message_log.xml | 4 ++--
yuthon_wechat/models/wecom_apps.py | 6 +-----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index b9f9beafc..7486580fc 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -1058,9 +1058,9 @@ class AttendanceMessageLog(models.Model):
_description = '消息提醒日志'
vacation_id = fields.Many2one('yuthon.vacation.reports', string='关联假期额度记录')
- employee_id = fields.Many2one('hr.employee', string='员工')
- department_id = fields.Many2one(related='employee_id.department_id', string="部门", index=True)
- company_id = fields.Many2one(related='employee_id.company_id', string="公司")
+ user_id = fields.Many2one('res.users', string='员工')
+ department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门", index=True)
+ company_id = fields.Many2one(related='users_id.employee_id.company_id', string="公司")
update_date = fields.Datetime(string='提醒时间')
shift_id = fields.Many2one('planning.slot', string="班次", compute="_compute_shift_id", store=True)
content = fields.Text(string='内容')
diff --git a/yuthon_hr_attendance/views/attendance_message_log.xml b/yuthon_hr_attendance/views/attendance_message_log.xml
index 8fb550a59..5a6c4a5bb 100644
--- a/yuthon_hr_attendance/views/attendance_message_log.xml
+++ b/yuthon_hr_attendance/views/attendance_message_log.xml
@@ -4,7 +4,7 @@
attendance.message.log
-
+
@@ -20,7 +20,7 @@
attendance.message.log
-
+
diff --git a/yuthon_wechat/models/wecom_apps.py b/yuthon_wechat/models/wecom_apps.py
index 1e3e90dce..8ee227032 100644
--- a/yuthon_wechat/models/wecom_apps.py
+++ b/yuthon_wechat/models/wecom_apps.py
@@ -161,12 +161,8 @@ class WeComApps(models.Model):
}
result_data = self.sync_function_api("message_send", "MESSAGE_SEND", data, category)
users_id = self.env["res.users"].search([("id", "=", user_id)], limit=1)
- if users_id:
- employee_id = self.env["hr.employee"].search([("user_id", "=", users_id.id)], limit=1).ids
- else:
- employee_id = False
self.env["attendance.message.log"].create({
- "employee_id": employee_id,
+ "user_id": users_id.id,
"content": description,
"notice_type": 'attendance',
'update_date': fields.Datetime.now(),