From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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..9420311 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_v2";
     }
 
     // 绯荤粺棣栭〉
@@ -82,7 +96,7 @@
         mmap.put("deptId", deptId);
 
         //鍚庡彴榛樿椤甸潰
-        String welcomeUrl = "/group/gis";
+        String welcomeUrl = "/home";
         mmap.put("welcomeUrl", welcomeUrl);
 
         // 鏍规嵁鐢ㄦ埛id鍙栧嚭鑿滃崟

--
Gitblit v1.9.3