From 696daad0798c29631ccda2d98ca52eedcbf2fcb4 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 20:57:27 +0800
Subject: [PATCH] bug:登录问题

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
index 4471cd3..0b9b525 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
@@ -175,16 +175,30 @@
         if(null == user){
             return "/login.html";
         }
-        List<String> roleList = Arrays.asList(user.getRoleid().split(","));
-        if (roleList == null || roleList.size() == 0) {
-            model.addAttribute("tips", "该用户没有角色,无法登陆");
+        List<String> roleList = new ArrayList<>();
+        if (user.getRoleid() != null) {
+            for (String roleId : user.getRoleid().split(",")) {
+                String trimmedRoleId = roleId.trim();
+                if (trimmedRoleId.matches("\\d+")) {
+                    try {
+                        Integer.valueOf(trimmedRoleId);
+                        roleList.add(trimmedRoleId);
+                    } catch (NumberFormatException ignored) {
+                        // 跳过超出 Integer 范围的脏角色数据。
+                    }
+                }
+            }
+        }
+        if (roleList.isEmpty()) {
+            model.addAttribute("tips", "该用户没有有效角色,无法登录");
             return "/login.html";
         }
         Integer language = UserExt.getLanguage();
         List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
         List<MenuNode> titles = MenuNode.buildTitle(menus);
 
-        List<String> resUrlsByRoleId = menuService.getResUrlsByRoleId(Integer.valueOf(roleList.get(0)));
+        Integer primaryRoleId = Integer.valueOf(roleList.get(0));
+        List<String> resUrlsByRoleId = menuService.getResUrlsByRoleId(primaryRoleId);
         CacheUtil.menus.put(user.getAccount(), resUrlsByRoleId);
 
         if (SinataUtil.isEmpty(user)){
@@ -197,7 +211,11 @@
 
         model.addAttribute("titles", titles);
 
-        Role role = roleService.getBaseMapper().selectById(roleList.get(0));
+        Role role = roleService.getBaseMapper().selectById(primaryRoleId);
+        if (role == null) {
+            model.addAttribute("tips", "该用户角色不存在,无法登录");
+            return "/login.html";
+        }
 
         User byId = userService.getById(user.getId());
         //获取用户头像 Obtain user profile

--
Gitblit v1.7.1