From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 17:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java
index d7d6c1d..aea0239 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java
@@ -37,6 +37,7 @@
public List<Menu> menuTree() {
// redis缓存
Map<Object, Object> regionList = redisTemplate.opsForHash().entries(RedisConstants.MENU_TREE);
+// Map<Object, Object> regionList = new HashMap<>();
// 获取所有地区信息 省市区三级
List<Menu> regions = getReginList(regionList);
Map<String, Menu> courseTypeMap = new HashMap<>();
@@ -47,8 +48,7 @@
courseTypeMap = regions.stream().filter(region -> region.getMenuId() != 88900&&
region.getMenuId() != 88901&&
region.getMenuId() != 88902&&
- region.getMenuId() != 88903).
- collect(Collectors.toMap(region -> region.getMenuId().toString()
+ region.getMenuId() != 88903).collect(Collectors.toMap(region -> region.getMenuId().toString()
, region -> region));
}
--
Gitblit v1.7.1