From 5a439616e01deef24ed71bd5b8a2a235f9642d6a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 13 二月 2025 16:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 6b095e6..f6158e2 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.TTenantResp;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
@@ -29,6 +30,7 @@
import com.ruoyi.system.utils.wx.tools.WxUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -129,6 +131,9 @@
tTenantService.save(tenant);
}
LoginUserApplet loginUserApplet = new LoginUserApplet();
+ TTenantResp tTenantResp = new TTenantResp();
+ BeanUtils.copyProperties(tenant, tTenantResp);
+ loginUserApplet.setUser(tTenantResp);
loginUserApplet.setUserId(Long.valueOf(tenant.getId()));
Map<String, Object> tokenInfos = new HashMap<>();
tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
--
Gitblit v1.7.1