From 4e0b0be90a8bf14a59f4cfee7959534adea24ba3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 18:45:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index f6713dc..27c8429 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -124,7 +124,7 @@
     @ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"微信小程序登录"})
     @GetMapping("/openIdByJsCode")
     public R<String> openIdByJsCode(@RequestParam String code) {
-        Long userId = tokenService.getLoginUser().getUserId();
+        Long userId = tokenService.getLoginUserApplet().getUserId();
         SysUser sysUser = sysUserService.selectUserById(userId);
         if(Objects.isNull(sysUser)){
             return R.fail("未查询到当前登录用户信息");

--
Gitblit v1.7.1