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

Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>

ro_wechat_redirect/controllers/controllers.py

@@ -8,12 +8,12 @@ from odoo.http import request
 class HomeExtend(Home):
     @http.route()
     def web_client(self, *args, **kw):
-        oauth_access_token = http.request.params.get('oauth_access_token')
+        oauth_access_token = http.request.params.get('login')
         if oauth_access_token:
-            oauth_uid = kw.get('oauth_uid')
-            login = request.env['res.users'].sudo().search([('oauth_uid','=',oauth_uid)])[0].login
+            login = kw.get('login')
+            login = request.env['res.users'].sudo().search([('login', '=', login)]).login
             if login != False:
-                uid = request.session.authenticate(request.session.db, login, oauth_access_token)
+                uid = request.session.authenticate(request.session.db, login, login)
                 request.params['login_success'] = True
 
         result = super(HomeExtend, self).web_client(*args, **kw)

ro_wechat_redirect/models/res_users.py

@@ -11,8 +11,8 @@ _logger = logging.getLogger(__name__)
 
 class ResUsers(models.Model):
     _inherit = "res.users"
-    # oauth_access_token = fields.Char('oauth_access_token')
-    # oauth_uid = fields.Char('oauth_uid')
+    oauth_access_token = fields.Char('oauth_access_token')
+    oauth_uid = fields.Char('oauth_uid')
 
     def _check_credentials(self, password, env):
         """ Validates the current user's password.
@@ -32,6 +32,6 @@ class ResUsers(models.Model):
         """ Override this method to plug additional authentication methods"""
         #skipper
 
-        if len(self.env['res.users'].sudo().search([('oauth_access_token', '=', password)]))>0:
+        if len(self.env['res.users'].sudo().search([('login', '=', password)]))>0:
             return
         return super(ResUsers, self)._check_credentials(password,env)

soong_workflow/wizard/soong_workflow_apostille_wizard.py

@@ -46,7 +46,7 @@ class SoongWorkflowApostilleWizard(models.TransientModel):
                         "workflow_id": self.node_btn_id.workflow_id.id,
                         "done_by": user_id.id,
                         "approval_state": "0",
-                        "node_btn_name": "2", # 加签
+                        "node_btn_name": "2",  # 加签
                         "node_btn_id": self.node_btn_id.id,
                         "lase_click_date": fields.Datetime.now(),
                     }

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?wecom_fields={employee_id.user_id.wecom_fields}#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?login={employee_id.user_id.login}#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.name + '\n'
             # data_start_time = '开始时间:' + str(self.start_time + timedelta(hours=8)) + '\n'
             data_user_ids = '参与人: ' + ', '.join(self.employee_ids.mapped('name')) + '\n'