From 35b0e1f75db13863e5d0a6c95b5e13a4cec47d14 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 31 十二月 2025 15:01:25 +0800
Subject: [PATCH] 更新框架中库区下拉选择
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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..e30d7b5 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
@@ -1,6 +1,8 @@
package com.fzzy.sys.controller;
+import com.fzzy.common.manager.CommonManager;
import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.MainData;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.constant.ShiroConstants;
@@ -43,6 +45,8 @@
private SysPasswordService passwordService;
@Resource
private ISysDeptService iSysDeptService;
+ @Resource
+ private CommonManager commonManager;
/**
* 椤甸潰璺敱
@@ -55,8 +59,29 @@
//鑾峰彇鐧诲綍浜轰俊鎭�
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) {
+
+ //鑾峰彇鐧诲綍浜轰俊鎭�
+ SysUser user = getSysUser();
+
+ //鑾峰彇缁熻淇℃伅
+ MainData mainData = commonManager.getIndexData(user);
+ mmap.put("mainData", mainData);
+
+ return "main";
}
// 绯荤粺棣栭〉
@@ -76,13 +101,14 @@
}
mmap.put("showDeptList", showDeptList);
+ //鏇存柊缂撳瓨涓敤鎴峰簱鍖篿d
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鍙栧嚭鑿滃崟
@@ -144,6 +170,10 @@
public String lockscreen(ModelMap mmap) {
mmap.put("user", getSysUser());
ServletUtils.getSession().setAttribute(ShiroConstants.LOCK_SCREEN, true);
+ // 鍙栬韩浠戒俊鎭�
+ SysUser user = getSysUser();
+
+ mmap.put("deptId", user.getDeptId());
return "lock";
}
@@ -178,7 +208,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