修改bug

Pu Zhibing

2025-07-04 c8638df756d5c56f2d0c3ed35522fc5a340122c8

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java

@@ -3,6 +3,7 @@
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.google.code.kaptcha.Constants;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.exception.InvalidKaptchaException;
@@ -16,8 +17,11 @@
import com.stylefeng.guns.core.util.KaptchaUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.Menu;
import com.stylefeng.guns.modular.system.model.Relation;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IMenuService;
import com.stylefeng.guns.modular.system.service.IRelationService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
@@ -42,6 +46,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

@@ -77,6 +82,9 @@
   
   private Map<String, Integer> loginFailures = new HashMap<>();
   
   @Autowired
   private IRelationService relationService;
	
   
   /**
    * 跳转到主页
@@ -101,11 +109,13 @@
      if (roleList == null || roleList.size() == 0) {
         roleList.add(0);
      }
		
      List<Relation> relations = relationService.selectList(new EntityWrapper<Relation>().in("roleid", roleList));
      Set<Long> collect = relations.stream().map(Relation::getMenuid).collect(Collectors.toSet());
      List<Menu> menuList = menuService.selectBatchIds(collect);
      List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
      List<MenuNode> titles = MenuNode.buildTitle(menus);
      titles = ApiMenuFilter.build(titles);
      shiroUser.setMenuIds(titles.stream().map(MenuNode::getUrl).collect(Collectors.toList()));
      shiroUser.setMenuIds(menuList.stream().map(Menu::getUrl).collect(Collectors.toList()));
      
      
      model.addAttribute("titles", titles);