From 96fd0da457350545a7d303ffe08c96354ec52cb5 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 18 九月 2024 16:44:18 +0800
Subject: [PATCH] 用户权限 页面一级菜单合并BUG  已修复

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
index 43e6058..7723716 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java
@@ -72,7 +72,6 @@
             accountRole.put("account",frist.get("account").toString());
             accountRole.put("role_id",frist.get("role_id").toString());
             for (Map<String,Object> item:username){
-
                 if(keyMenus.contains(item.get("menu_id").toString())){
                     //瀛樺湪姝よ彍鍗�
                     int index=keyMenus.indexOf(item.get("menu_id").toString());
@@ -90,8 +89,9 @@
                     thisMenu.put("pages",thisPages);
                     thisMenus.set(index,thisMenu);
                     accountRole.put("menus",thisMenus);
-                }else if(keyMenus.size()>0){
+                }else if(keyMenus.size()>0&&!keyMenus.contains(item.get("menu_id").toString())){
                     //涓嶅瓨鍦ㄦ鑿滃崟
+                    keyMenus.add(item.get("menu_id").toString());
                     List<Map<String, Object>> thisMenus= (List<Map<String, Object>>) accountRole.get("menus");
                     Map<String, Object> thisMenu=new HashMap<>();
                     thisMenu.put("menu_id",item.get("menu_id"));

--
Gitblit v1.8.0