Merge branch 'test' of http://112.74.196.215:3000/Tech2/data-daq into test

service-manage/src/main/java/com/simuwang/manage/service/LoginService.java

@@ -99,15 +99,15 @@ public class LoginService {
                 .distinct().collect(Collectors.toList());
         // 用户权限处理
         List<SysMenuDO> menuList = this.userAuthService.listUserMenuByUserId(userId, 1);
-        // 过滤按钮
-        List<MenuTreeDTO> tempList = menuList.stream()
+        // 返回用户的权限菜单ID
+        List<Integer> menuIds = menuList.stream().map(e -> e.getMenuId()).collect(Collectors.toList());
+        // 全部菜单列表转树结构
+        List<SysMenuDO> allMenuList = this.userAuthService.listUserMenuByUserId(0, 1);
+        List<MenuTreeDTO> allTempList = allMenuList.stream()
                 .map(MenuTreeDTO::new).collect(Collectors.toList());
-        // 菜单列表转树结构
-        List<MenuTreeDTO> trees = TreeUtil.list2Tree(tempList, MenuTreeDTO::getId, MenuTreeDTO::getPid,
+        List<MenuTreeDTO> trees = TreeUtil.list2Tree(allTempList, MenuTreeDTO::getId, MenuTreeDTO::getPid,
                 MenuTreeDTO::getChildren, MenuTreeDTO::setChildren, 0, MenuTreeDTO::getSort);
         MenuTreeDTO root = new MenuTreeDTO(0, "全部菜单", trees);
-        // 返回的数据结构构建
-        List<Integer> menuIds = tempList.stream().map(e -> e.getId()).collect(Collectors.toList());
         UserInfoVO vo = new UserInfoVO(userId, username, roles, root,menuIds);
         vo.setEmail(userInfo.getEmail());
         vo.setPhonenumber(userInfo.getPhonenumber());