From 30f124fbe2c638eecda3d74c6dde053af5d574f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:26:17 +0800
Subject: [PATCH] 提交代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
index 3d198f7..0765ece 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
@@ -72,14 +72,14 @@
@RequestMapping("")
public String blackboard(Model model,Integer type,Integer agentId,String dayDate,String yearDate,String monthDate) {
//查询当前用户是否有"首页"菜单的权限
- Integer id = ShiroKit.getUser().getId();
+ Integer id = shiroExtUtil.getUser().getId();
User user = userService.selectById(id);
Integer menuNum = userService.getMenuNumByRole(user.getRoleid());
if (menuNum > 0){
return "/home.html";
} else {
//查询登录次数
-// int count = loginLogService.selectCount(new EntityWrapper<LoginLog>().eq("userid", ShiroKit.getUser().getId()));
+// int count = loginLogService.selectCount(new EntityWrapper<LoginLog>().eq("userid", shiroExtUtil.getUser().getId()));
// model.addAttribute("loginNum", count);
//
// Role role = roleService.selectById(user.getRoleid());
@@ -93,8 +93,8 @@
if(Objects.isNull(type)){
type = 1;
}
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType != 1){
if(roleType == 2 && Objects.nonNull(objectId)){
// 查询所有分公司
@@ -113,7 +113,7 @@
model.addAttribute("agentList",agentList);
}
model.addAttribute("txt",new SimpleDateFormat("yyyy年MM月dd日").format(new Date()) + DateUtil.getWeekDay(new Date()) + ",欢迎" +
- Objects.requireNonNull(ShiroKit.getUser()).getName() + "登录");
+ Objects.requireNonNull(shiroExtUtil.getUser()).getName() + "登录");
Map<String, Object> map = new HashMap<>();
if(Objects.nonNull(agentId)){
// 统计分公司
--
Gitblit v1.7.1