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

yuthon_lessee_service/models/yuthon_lessee_notice.py

@@ -102,7 +102,7 @@ class YuthonLesseeNotice(models.Model):
                         'state': 'no',
                     })
                     # wechat
-                    menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的通知公告')])
+                    menu_id = self.env['ir.ui.menu'].search([('name', '=', '通知公告')])
                     str = 'https://www.thtzjt.com/web#id={}&cids=1&menu_id={}&action={}&model=yuthon.notice&view_type=form'.format(
                         self.id, menu_id.id, menu_id.action.id)
                     data = "您有新的通知公告请及时确认\n" + "<a href=\"{}\">{}</a>".format(str, self.name)

yuthon_notice/models/yuthon_confirm_users.py

@@ -14,7 +14,7 @@ class YuthonConfirmUsers(models.Model):
     state = fields.Selection([('no', '未确认'), ('yes', '已确认')], string="状态")
 
     def sync_confirm_users_notices(self):
-        menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的通知公告')])
+        menu_id = self.env['ir.ui.menu'].search([('name', '=', '通知公告')])
         for record in self.search([('state', '=', 'no')]):
             partner_ids = record.employee_id.user_id.partner_id.id
             record.with_context(lang=record.env.lang)._message_auto_subscribe_notify(partner_ids, 'yuthon_notice.message_yuthon_confirm_users_data')
@@ -28,7 +28,7 @@ class YuthonConfirmUsers(models.Model):
                 raise UserError('已确认不可催办')
         confirm_noice_ids = self.env["yuthon.confirm.users"].browse(self._context.get('active_ids', self._context.get('active_id')))
         for rec in confirm_noice_ids:
-            menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的通知公告')])
+            menu_id = self.env['ir.ui.menu'].search([('name', '=', '通知公告')])
             url = f'https://oa.thtzjt.com/web#id={self.id}&cids=2&action={menu_id.action.id}&model=yuthon.notice&view_type=list&menu_id={menu_id.id}'
             self.sudo().env["wecom.apps"].sync_send_message_textcard(category='notice', user_id=rec.employee_id.wecom_userid,
                                                                      title="通知公告(催办)", description="您有待确认的通知公告请尽快确认",