From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/java/com/ld/igds/web/WebController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/igds-web/src/main/java/com/ld/igds/web/WebController.java b/igds-web/src/main/java/com/ld/igds/web/WebController.java
index 9f871a9..dcd12a2 100644
--- a/igds-web/src/main/java/com/ld/igds/web/WebController.java
+++ b/igds-web/src/main/java/com/ld/igds/web/WebController.java
@@ -97,7 +97,7 @@
// 鎶�鏈敮鎸佷俊鎭�
view.addObject("support", "鎶�鏈敮鎸侊細" + sysConf.getSupport());
- if (StringUtils.isEmpty(groupTag)){
+ if (StringUtils.isEmpty(groupTag)) {
groupTag = "0";
}
view.addObject("groupTag", groupTag);
@@ -111,7 +111,12 @@
if ("5318".equals(companyId)) {
view.setViewName("index/index-5318");
}
-
+ if ("5326".equals(companyId)) {
+ view.setViewName("index/index-5326");
+ }
+ if ("5329".equals(companyId)) {
+ view.setViewName("index/index-5329");
+ }
return view;
}
@@ -191,7 +196,7 @@
welcomeUrl += "all";
} else {
welcomeUrl += code;
- menuList = systemService.getMenuBySystemId(company.getId(), code,user);
+ menuList = systemService.getMenuBySystemId(company.getId(), code, user);
}
view.addObject("menuList", menuList);
--
Gitblit v1.9.3