From f2dff53d76a7e9a23e6a2ecfed58ce978dc41442 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 九月 2024 18:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 77abd3e..1cc1d79 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -9,6 +9,7 @@
import io.seata.spring.annotation.GlobalTransactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
@@ -48,11 +49,11 @@
HashMap<String, Object> map = new HashMap<>();
map.put("token", tokenService.createToken(userInfo));
List<SysRole> roles = userInfo.getSysUser().getRoles();
-// if(CollectionUtils.isEmpty(roles)){
-// return R.fail("请关联角色!");
-// }
+ if(CollectionUtils.isEmpty(roles)){
+ return R.fail("请关联角色!");
+ }
-// map.put("roleName",roles.get(0).getRoleName());
+ map.put("roleName",roles.get(0).getRoleName());
map.put("info", userInfo);
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
--
Gitblit v1.7.1