From aef81cf74dfe309e3efb8738ff26cbef9892c28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Mon, 9 Jun 2025 10:46:19 +0800
Subject: [PATCH] 1

---
 yuthon_hr_attendance/controllers/applet_attendance.py | 11 ++++++++---
 yuthon_will_task/models/yuthon_will_task.py           |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py
index a78fe05c4..c99167c24 100644
--- a/yuthon_hr_attendance/controllers/applet_attendance.py
+++ b/yuthon_hr_attendance/controllers/applet_attendance.py
@@ -54,7 +54,7 @@ class AppletAttendance(Controller):
         latitude = address_id.latitude  # 要求纬度
         if not att_longitude or not att_latitude:
             return_data = {
-                'data': {"Msg": "经纬度必填", 'state': 'no', 'state_result': '超出范围'},
+                'data': {"message": "经纬度必填", 'state': 'no', 'state_result': '超出范围'},
                 'code': '200',
                 'message': 'OK',
             }
@@ -62,7 +62,7 @@ class AppletAttendance(Controller):
         card_rice = address_id.card_rice * 0.001  # 打卡范围
         if not self.is_within_radius_geopy(att_latitude, att_longitude, latitude, longitude, card_rice):
             return_data = {
-                'data': {"Msg": "超出范围，不允许打卡", 'state': 'no', 'state_result': '超出范围'},
+                'data': {"message": "超出范围，不允许打卡", 'state': 'no', 'state_result': '超出范围'},
                 'code': '200',
                 'message': 'OK',
             }
@@ -151,4 +151,9 @@ class AppletAttendance(Controller):
                 'checkin_time': checkin_time,  # 打卡时间
                 'source': 'mini_programs',  # 打卡来源
                 'location_title': location_title,  # 打卡地点
-            })
\ No newline at end of file
+            })
+        return_data = {
+            'code': '200',
+            'message': '推送成功',
+        }
+        return json.dumps(return_data)
\ No newline at end of file
diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py
index 6ce406d9b..4da8dbcec 100644
--- a/yuthon_will_task/models/yuthon_will_task.py
+++ b/yuthon_will_task/models/yuthon_will_task.py
@@ -155,7 +155,7 @@ class YuthonWillTask(models.Model):
             if not employee_id.wecom_userid:
                 raise UserError("请同步{}的企业微信".format(employee_id.name))
             menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的日程')])
-            url = f'https://oa.thtzjt.com/web?login={employee_id.user_id.login}oauth_uid={employee_id.wecom_userid}#id={self.id}&cids=2&action={menu_id.action.id}&model=yuthon.will.task&view_type=form&menu_id={menu_id.id}'
+            url = f'https://oa.thtzjt.com/web?id={employee_id.user_id.id}oauth_uid={employee_id.wecom_userid}#id={self.id}&cids=2&action={menu_id.action.id}&model=yuthon.will.task&view_type=form&menu_id={menu_id.id}'
             data_name = "事项名称: " + self.task_content + '\n'
             # data_start_time = '开始时间:' + str(self.start_time + timedelta(hours=8)) + '\n'
             data_user_ids = '参与人: ' + ', '.join(self.employee_ids.mapped('name')) + '\n'