Merge remote-tracking branch 'origin/develop' into develop

service-manage/src/main/java/com/simuwang/manage/dto/UserInfoVO.java

@@ -32,16 +32,29 @@ public class UserInfoVO {
      * 菜单树
      */
     private MenuTreeDTO menuTree;
+    /**
+     * 菜单权限ID集合
+     */
+    private List<Integer> menuIds;
 
     public UserInfoVO() {
     }
 
-    public UserInfoVO(Integer userId, String username, List<UserRoleDTO> roles, MenuTreeDTO menuTree) {
+    public UserInfoVO(Integer userId, String username, List<UserRoleDTO> roles, MenuTreeDTO menuTree,List<Integer> menuIds) {
         this();
         this.userId = userId;
         this.username = username;
         this.roles = roles;
         this.menuTree = menuTree;
+        this.menuIds = menuIds;
+    }
+
+    public List<Integer> getMenuIds() {
+        return menuIds;
+    }
+
+    public void setMenuIds(List<Integer> menuIds) {
+        this.menuIds = menuIds;
     }
 
     public Integer getUserId() {

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

@@ -99,15 +99,16 @@ 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);
-        // 返回的数据结构构建
-        UserInfoVO vo = new UserInfoVO(userId, username, roles, root);
+        UserInfoVO vo = new UserInfoVO(userId, username, roles, root,menuIds);
         vo.setEmail(userInfo.getEmail());
         vo.setPhonenumber(userInfo.getPhonenumber());
         return vo;