Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou

Signed-off-by: 李鹏宇 <pengyuthon@163.com>

yuthon_hr_attendance/models/hr_attendance.py

@@ -336,6 +336,11 @@ class HrAttendance(models.Model):
                                                                      title='【考勤异常提醒】',
                                                                      description='考勤异常请尽快处理',
                                                                      url=url, btntxt="查看详情")
+            self.sudo().env["wecom.apps"].sync_send_message_textcard(category='att_ok',
+                                                                     user_id='78',
+                                                                     title='【考勤异常提醒】',
+                                                                     description=f'单独给叶发的测试{emp.name}后续关掉',
+                                                                     url=url, btntxt="查看详情")
 
     def missing_card_judgment(self):
         today = fields.Date.today()

yuthon_hr_attendance/wizard/export_date_wizard.py

@@ -100,9 +100,9 @@ class ExportDateWizard(models.TransientModel):
             domain = [('id', 'in', active_ids)] + domain
         
         filtered_records = self.env['hr.leave'].search(domain)
-        
+
         if not filtered_records:
-            raise UserError(f'在 {self.year} 年 {self.month} 月没有找到符合条件的归档请假记录（is_filiing=True）')
+            raise UserError(f'在 {self.year} 年 {self.month} 月没有找到符合条件的归档请假记录')
         
         filtered_ids = filtered_records.ids
         

yuthon_wechat/models/wecom_apps.py

@@ -198,22 +198,24 @@ class WeComApps(models.Model):
                     "btntxt": btntxt
                 },
             }
-        result_data = self.sync_function_api("message_send", "MESSAGE_SEND", data, category)
-        employee_id = self.sudo().env["res.users"].search([("login", "=", user_id)], limit=1).employee_ids
-        notice_type = 'attendance' if '记得打卡' in description else 'process'
         service_address = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
-        self.env["attendance.message.log"].create({
-            "employee_id": employee_id.id,
-            "content": description,
-            "notice_type": notice_type,
-            "service_address":service_address,
-            'update_date': fields.Datetime.now(),
-            "message_url": url,
-        })
-        _logger.info(f"------------------------接口收到响应返回值{result_data}-------------------------------")
-        if result_data.get("errcode", None) == 0:
-            return True, result_data
-        return False, result_data
+        _logger.info(f"企业微信接口请求地址{service_address}-------------------------------")
+        if '8057' not in service_address:
+            result_data = self.sync_function_api("message_send", "MESSAGE_SEND", data, category)
+            employee_id = self.sudo().env["res.users"].search([("login", "=", user_id)], limit=1).employee_ids
+            notice_type = 'attendance' if '记得打卡' in description else 'process'
+            self.env["attendance.message.log"].create({
+                "employee_id": employee_id.id,
+                "content": description,
+                "notice_type": notice_type,
+                "service_address":service_address,
+                'update_date': fields.Datetime.now(),
+                "message_url": url,
+            })
+            _logger.info(f"------------------------接口收到响应返回值{result_data}-------------------------------")
+            if result_data.get("errcode", None) == 0:
+                return True, result_data
+            return False, result_data
 
     def sync_user_update(self, user_id=None, name=None, mobile=None, biz_mail=None, department=None):
         data = {}