From af8af24790cb7240da60c6752d47254d62533ffb Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 三月 2026 17:11:55 +0800
Subject: [PATCH] 出入库明细，导入导出，根据登录用户类型，以及搜索条件，做回显调整
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 7912b32..8c5bd1e 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;
/**
* 椤甸潰璺敱
@@ -69,8 +73,15 @@
@GetMapping("/home")
public String home(ModelMap mmap) {
- mmap.put("version", FrameworkConfig.getVersion());
- return "main_v2";
+
+ //鑾峰彇鐧诲綍浜轰俊鎭�
+ SysUser user = getSysUser();
+
+ //鑾峰彇缁熻淇℃伅
+ MainData mainData = commonManager.getIndexData(user);
+ mmap.put("mainData", mainData);
+
+ return "main";
}
// 绯荤粺棣栭〉
@@ -84,12 +95,12 @@
//鍒ゆ柇鏄惁鏄剧ず搴撳尯閫夋嫨寮圭獥
String showDeptList = "Y";
- SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
- if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
showDeptList = "N";
}
mmap.put("showDeptList", showDeptList);
+ //鏇存柊缂撳瓨涓敤鎴峰簱鍖篿d
ContextUtil.updateSubDept(user.getLoginName(), deptId);
SysDept dept = iSysDeptService.selectDeptById(Long.valueOf(deptId));
mmap.put("dept", dept);
@@ -158,6 +169,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";
}
--
Gitblit v1.9.3