From 02bda1d18155af18daf5a0e8642c4a3bbb4f2dc4 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 18 九月 2024 16:45:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
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