From d1c35f06e175e0ff63347a5ed5e09788163dccb7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:42 +0800
Subject: [PATCH] 修改权限控制逻辑
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 1053dde..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,17 +49,16 @@
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();
sysUser.setUserId(userInfo.getSysUser().getUserId());
sysUser.setLoginDate(new Date());
- sysUser.setRoleId(userInfo.getSysUser().getRoleId());
System.out.println("修改用户登录时间" + sysUser);
userClient.updateSysUser(sysUser);
return R.ok(map);
--
Gitblit v1.7.1