From 67cbfd8f7c2ed9598eef92470313f3cf31028ea1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 11 三月 2025 08:39:33 +0800
Subject: [PATCH] 2.13-3-7号 现场标注线调试更改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/AccountServiceImpl.java | 8 ++++++--
1 files changed, 6 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..ea7c0ef 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
@@ -47,6 +47,7 @@
.selectAs(RoleMenu::getMenuId,"menu_id")
.selectAs(RoleMenu::getPageId,"page_id")
.selectAs(RoleMenu::getMenuSequence,"remark")
+ .selectAs(RoleMenu::getParams,"params")
.selectAs(Menu::getMenuName,"menu_name")
.selectAs(Menu::getMenuNumber,"menu_number")
.selectAs(Menu::getRemark,"menu_remark")
@@ -72,7 +73,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());
@@ -86,12 +86,14 @@
page.put("page_number",item.get("page_number"));
page.put("page_url",item.get("page_url"));
page.put("menu_sequence",item.get("menu_sequence"));
+ page.put("params",item.get("params"));
thisPages.add(page);
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"));
@@ -106,6 +108,7 @@
page.put("page_number",item.get("page_number"));
page.put("page_url",item.get("page_url"));
page.put("menu_sequence",item.get("menu_sequence"));
+ page.put("params",item.get("params"));
thisPages.add(page);
thisMenu.put("pages",thisPages);
thisMenus.add(thisMenu);
@@ -127,6 +130,7 @@
page.put("page_number",item.get("page_number"));
page.put("page_url",item.get("page_url"));
page.put("menu_sequence",item.get("menu_sequence"));
+ page.put("params",item.get("params"));
pages.add(page);
menu.put("pages",pages);
menus.add(menu);
--
Gitblit v1.8.0