From 18127822f3cdb4778fb62ba0304bb8372dada516 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 17 十二月 2025 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
index 9717fe1..3b775eb 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
@@ -55,8 +55,22 @@
//鑾峰彇鐧诲綍浜轰俊鎭�
SysUser user = getSysUser();
+ if(Constant.USER_TYPE_30.equals(user.getUserType())){
+ //鍗曞簱鍖轰富椤�
+ return "redirect:index?deptId=" + user.getDeptId();
+ }
+ if(Constant.USER_TYPE_10.equals(user.getUserType()) || Constant.USER_TYPE_20.equals(user.getUserType())){
+ //澶у睆椤甸潰
+ return "redirect:group/index";
+ }
//鍗曞簱鍖轰富椤�
return "redirect:index?deptId=" + user.getDeptId();
+ }
+
+ @GetMapping("/home")
+ public String home(ModelMap mmap) {
+ mmap.put("version", FrameworkConfig.getVersion());
+ return "main";
}
// 绯荤粺棣栭〉
@@ -68,21 +82,13 @@
mmap.put("user", user);
mmap.put("sysName", FrameworkConfig.getName());
- //鍒ゆ柇鏄惁鏄剧ず搴撳尯閫夋嫨寮圭獥
- String showDeptList = "Y";
- SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
- if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
- showDeptList = "N";
- }
- mmap.put("showDeptList", showDeptList);
-
ContextUtil.updateSubDept(user.getLoginName(), deptId);
SysDept dept = iSysDeptService.selectDeptById(Long.valueOf(deptId));
mmap.put("dept", dept);
mmap.put("deptId", deptId);
//鍚庡彴榛樿椤甸潰
- String welcomeUrl = "/group/gis";
+ String welcomeUrl = "/home";
mmap.put("welcomeUrl", welcomeUrl);
// 鏍规嵁鐢ㄦ埛id鍙栧嚭鑿滃崟
@@ -178,7 +184,7 @@
@GetMapping("/system/main")
public String main(ModelMap mmap) {
mmap.put("version", FrameworkConfig.getVersion());
- return "main_v2";
+ return "main_v1";
}
// content-main class
--
Gitblit v1.9.3