!7474 1

Merge pull request !7474 from 李鹏宇/dev

yuthon_hr_attendance/controllers/applet_attendance.py

@@ -1293,12 +1293,15 @@ class AppletAttendance(Controller):
                 'bssid': bssid,
             })
         else:
-            request.env['wifi.message'].sudo().create({
+            message_ids = request.env['wifi.message'].sudo().create({
                 'mac': mac,
                 'name': name,
                 'bssid': bssid,
                 'company_id': company_id
             })
+            for app_wifi in request.env['applet.address'].sudo().search([('compnay_id', '=', message_ids.company_id)]):
+                app_wifi.write({'wifi_name_ids': [(4, 0, message_ids.ids)]})
+            _logger.info(f'{message_ids}已经创建到{message_ids.company_id.name}中--------')
 
         return json.dumps({
             'code': 200,

yuthon_wechat/controllers/main.py

@@ -13,15 +13,9 @@ class Home(http.Controller):
 
     @http.route('/wechat/login', type='http', auth="none", methods=['GET'])
     def wechat_login(self):
-        '''
-            返回wechat login 的链接
-        '''
         base_url = request.env['ir.config_parameter'].sudo().get_param('web.base.url')
         redirect_uri = quote(f'{base_url}/wechat/login_by_code')
-        # urlencode redirect_uri python
         redirect_uri = redirect_uri.replace(' ', '%20')
-
-
         appid = 'wwc955c117b738b052'
         agent_id = '1000120'
         url = f'https://open.weixin.qq.com/connect/oauth2/authorize?appid={appid}&redirect_uri={redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&agentid={agent_id}#wechat_redirect'
@@ -29,8 +23,6 @@ class Home(http.Controller):
 
     @http.route('/wechat/login_by_code', typ='http', auth="none", methods=['GET'])
     def wechat_login_by_code(self, code):
-
         provider = request.env.ref('yuthon_wechat.wechat_corp_web_auth_oauth_provider')
         (db, login, code) = request.env['res.users'].sudo().auth_oauth_wechat(provider.sudo(), {'code': code})
-
         return (db, login, code)