Prechádzať zdrojové kódy

修复菜单叠加问题

lighter 4 mesiacov pred
rodič
commit
656f2995c5

+ 0 - 2
src/main/java/thyyxxk/webserver/controller/ShutDownController.java

@@ -23,7 +23,6 @@ public class ShutDownController {
         this.extraCache = extraCache;
     }
 
-
     @GetMapping("sendSystemUpdatesMessage")
     public ResultVo<String> sendSystemUpdatesMessage(String message) {
         extraCache.put(CacheEnums.SYSTEM_UPDATES_MESSAGE.getName(), message);
@@ -43,5 +42,4 @@ public class ShutDownController {
         return ResultVoUtil.success(extraCache.getMessage());
     }
 
-
 }

+ 5 - 1
src/main/java/thyyxxk/webserver/service/settings/MenuSettingsService.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.service.settings;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -88,10 +90,12 @@ public class MenuSettingsService {
     private List<IntergrationMenu> getRedisMenuByCode(String code) {
         UserInfo userInfo = cache.get(code);
         List<IntergrationMenu> menuList = extraCache.getValue(CacheEnums.MENU, dao::getAll);
+
+        menuList = JSONArray.parseArray(JSONObject.toJSONString(menuList), IntergrationMenu.class);
+
         if (userInfo.getRoles().contains(1)) {
             return menuList;
         }
-
         List<IntergrationMenu> passRule = new ArrayList<>();
         for (IntergrationMenu item : menuList) {
             if (item.getMetaPassRule()) {