菜单接口包含按钮数据

server-service/src/main/java/com/makeit/service/saas/impl/SaasUserServiceImpl.java

@@ -328,7 +328,12 @@ implements SaasUserService{
 
     private void fillMenuList(List<SaasMenu> menuList, SaasUserLoginVO userLoginVO) {
         List<SaasMenu> buttonList = StreamUtil.filter(menuList, e -> SysEnum.MenuTypeEnum.MENU.getValue().equals(e.getCategory()) || SysEnum.MenuTypeEnum.BUTTON.getValue().equals(e.getCategory()));
-        List<SaasMenu> nonButtonList = StreamUtil.filter(menuList, e -> SysEnum.MenuTypeEnum.CATALOGUE.getValue().equals(e.getCategory()) || SysEnum.MenuTypeEnum.MENU.getValue().equals(e.getCategory()));
+        List<SaasMenu> nonButtonList = StreamUtil.filter(menuList, e ->
+                SysEnum.MenuTypeEnum.CATALOGUE.getValue().equals(e.getCategory())
+                || SysEnum.MenuTypeEnum.MENU.getValue().equals(e.getCategory())
+                || SysEnum.MenuTypeEnum.BUTTON.getValue().equals(e.getCategory())
+
+        );
         List<SaasMenuDTOVO> menuVOList = saasMenuService.tree(BeanDtoVoUtils.listVo(nonButtonList, SaasMenuDTOVO.class));
 
         userLoginVO.setButtonList(BeanDtoVoUtils.listVo(buttonList, SaasMenuDTOVO.class));
@@ -345,15 +350,15 @@ implements SaasUserService{
     }
 
     private void setRoleMenuToRedis(SaasUserLoginVO userLoginVO) {
-        SaasUserRoleMenuRedisVO platUserRoleMenuRedisVO = new SaasUserRoleMenuRedisVO();
-        platUserRoleMenuRedisVO.setId(userLoginVO.getId());
+        SaasUserRoleMenuRedisVO saasUserRoleMenuRedisVO = new SaasUserRoleMenuRedisVO();
+        saasUserRoleMenuRedisVO.setId(userLoginVO.getId());
         if (userLoginVO.getRoleList() != null) {
-            platUserRoleMenuRedisVO.setRoleCodeList(StreamUtil.map(userLoginVO.getRoleList(), SaasRoleDTOVO::getCode));
+            saasUserRoleMenuRedisVO.setRoleCodeList(StreamUtil.map(userLoginVO.getRoleList(), SaasRoleDTOVO::getCode));
         }
         if (userLoginVO.getButtonList() != null) {
-            platUserRoleMenuRedisVO.setButtonCodeList(StreamUtil.map(userLoginVO.getButtonList(), SaasMenuDTOVO::getCode));
+            saasUserRoleMenuRedisVO.setButtonCodeList(StreamUtil.map(userLoginVO.getButtonList(), SaasMenuDTOVO::getCode));
         }
-        TokenUtil.platLoginRoleMenu(platUserRoleMenuRedisVO);
+        TokenUtil.platLoginRoleMenu(saasUserRoleMenuRedisVO);
     }