Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/controller/CompanyController.java

@@ -44,9 +44,9 @@ public class CompanyController {
      * @author : admin
      * @date   : 2023/2/3 13:32
      */
-    @PostMapping({"select_company/{openid}"})
-    public ResponseResultVO<?> selectByOpenId(@PathVariable String openid) {
-        return companyService.selectByOpenId(openid);
+    @PostMapping({"select_company"})
+    public ResponseResultVO<?> selectByOpenId(@RequestBody Map<String,Object> map) {
+        return companyService.selectByOpenId(map.get("openId").toString());
     }
 
     /**

src/main/java/com/dk/oauth/service/impl/AuthAccessTokenServiceImpl.java

@@ -815,6 +815,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
         UserLogin userLogin = userMapper.selectById(userId);
         Map<String, Object> map = new HashMap<>();
         map.put("publicOpenId",userLogin.getPublicOpenId());
+        map.put("userWxId",userLogin.getUserWxid());
         map.put("userImage",userLogin.getUserImage());
         return ResponseResultUtil.success(map);
     }