From a857feef16fdd2ea9295f0be82a8fdaa34f13595 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 24 四月 2025 18:10:30 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/MenuService.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/example/client/service/MenuService.java b/src/main/java/com/example/client/service/MenuService.java
index 85417d0..5e3114f 100644
--- a/src/main/java/com/example/client/service/MenuService.java
+++ b/src/main/java/com/example/client/service/MenuService.java
@@ -4,7 +4,7 @@
import com.example.client.Main;
import com.example.server.menu.model.Menu;
import com.example.server.menu.service.SysMenuService;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -61,7 +61,7 @@
node.setMenuName("榛樿鏍硅妭鐐�");
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(node);
- String site = (String) CacheUtils.get("site", "site");
+ String site = (String) UserAndSiteUtils.get("site", "site");
List<Menu> list = menuService.getList(site);
createSubNode(rootNode, list);
@@ -93,29 +93,37 @@
JPanel level1Manage = level1ManageService.createTable(width, height, frame);
main.showTab("涓�绾х綉缁滃浘绠＄悊", level1Manage, tree);
} else if (nodeName.equals("涓�绾х綉缁滃浘鏌ョ湅")) {
- JPanel level1View = level1ViewService.createTable(width, height);
- main.showTab("涓�绾х綉缁滃浘鏌ョ湅", level1View, tree);
+ JPanel level1View = level1ViewService.createTable(width, height,frame);
+ if(level1View!=null){
+ main.showTab("涓�绾х綉缁滃浘鏌ョ湅", level1View, tree);
+ }
} else if (nodeName.equals("浜岀骇缃戠粶鍥剧鐞�")) {
JPanel level2Manage = level2ManageService.createTable(width, height, frame);
main.showTab("浜岀骇缃戠粶鍥剧鐞�", level2Manage, tree);
} else if (nodeName.equals("浜岀骇缃戠粶鍥炬煡鐪�")) {
- JPanel level2View = level2ViewService.createTable(width, height);
- main.showTab("浜岀骇缃戠粶鍥炬煡鐪�", level2View, tree);
+ JPanel level2View = level2ViewService.createTable(width, height,frame);
+ if(level2View!=null){
+ main.showTab("浜岀骇缃戠粶鍥炬煡鐪�", level2View, tree);
+ }
} else if (nodeName.equals("涓夌骇缃戠粶鍥剧鐞�")) {
JPanel level3Manage = level3ManageService.createTable(width, height, frame);
main.showTab("涓夌骇缃戠粶鍥剧鐞�", level3Manage, tree);
} else if (nodeName.equals("涓夌骇缃戠粶鍥炬煡鐪�")) {
- JPanel level3View = level3View2Service.createTable(width, height);
+ JPanel level3View = level3View2Service.createTable(width, height,frame);
main.showTab("涓夌骇缃戠粶鍥炬煡鐪�", level3View, tree);
} else if (nodeName.equals("椤圭洰杩涘害琛�")) {
JPanel trackRecord = trackRecordManageService.createTable(width, height, frame);
main.showTab("椤圭洰杩涘害琛�", trackRecord, tree);
} else if (nodeName.equals("浜ゆ帴鎯呭喌")) {
JPanel handover = handoverService.createTable(width, height, frame);
- main.showTab("浜ゆ帴鎯呭喌", handover, tree);
+ if(handover!=null){
+ main.showTab("浜ゆ帴鎯呭喌", handover, tree);
+ }
} else if (nodeName.equals("鏁版嵁瀵煎叆")) {
JPanel dataImport = dataImportManageService.createTable(width, height, frame);
- main.showTab("鏁版嵁瀵煎叆", dataImport, tree);
+ if(dataImport!=null){
+ main.showTab("鏁版嵁瀵煎叆", dataImport, tree);
+ }
} else if (nodeName.equals("鏁版嵁瀵煎嚭")) {
JPanel dataExport = dataExportManageService.createTable(width, height, frame);
main.showTab("鏁版嵁瀵煎嚭", dataExport, tree);
@@ -124,10 +132,14 @@
main.showTab("鐢ㄦ埛绠＄悊", user, tree);
} else if (nodeName.equals("鎷嗗嵏杩涘害琛�")) {
JPanel dismantTrack = dismantTrackService.createTable(width, height, frame);
- main.showTab("鎷嗗嵏杩涘害琛�", dismantTrack, tree);
+ if(dismantTrack!=null){
+ main.showTab("鎷嗗嵏杩涘害琛�", dismantTrack, tree);
+ }
}else if (nodeName.equals("瀛愰儴浠堕厤缃�")) {
JPanel subunit = subunitService.createTable(width, height, frame);
- main.showTab("瀛愰儴浠堕厤缃�", subunit, tree);
+ if(subunit!=null){
+ main.showTab("瀛愰儴浠堕厤缃�", subunit, tree);
+ }
}else if (nodeName.equals("涓撲笟绠＄悊")) {
JPanel teamGroup = teamGroupManageService.createTable(width, height, frame);
main.showTab("涓撲笟绠＄悊", teamGroup, tree);
--
Gitblit v1.9.1