From a0af42a6acfc7a0ebbb92bffc1816525e508af70 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 十月 2025 16:54:06 +0800
Subject: [PATCH] 修改bug

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
index 354775b..f67c827 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.stylefeng.guns.GunsApplication;
 import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.common.constant.state.Order;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.util.ToolUtil;
@@ -69,6 +70,9 @@
     @Autowired
     private RedisUtil redisUtil;
 
+    @Autowired
+    private ShiroExtUtil shiroExtUtil;
+
     private String PREFIX = "/system/tHomePage/";
 
     /**
@@ -77,8 +81,8 @@
     @RequestMapping("/map")
     public String map(Integer agentId,Integer type,Model model) {
 
-        Integer objectId = ShiroKit.getUser().getObjectId();
-        Integer roleType = ShiroKit.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
         if(roleType == 3 && Objects.nonNull(objectId)){
             agentId = objectId;
         }
@@ -259,8 +263,8 @@
     @RequestMapping("/getServerOrder")
     @ResponseBody
     public Object getServerOrder(Integer agentId,Model model) {
-        Integer objectId = ShiroKit.getUser().getObjectId();
-        Integer roleType = ShiroKit.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
         if(roleType == 3 && Objects.nonNull(objectId)){
             agentId = objectId;
         }
@@ -362,8 +366,8 @@
      */
     @RequestMapping("/statistics")
     public String statistics(Integer agentId,String dayDate,String yearDate,String monthDate,Integer type,Model model) {
-        Integer objectId = ShiroKit.getUser().getObjectId();
-        Integer roleType = ShiroKit.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
         if(roleType == 3 && Objects.nonNull(objectId)){
             agentId = objectId;
         }
@@ -371,7 +375,7 @@
             type = 1;
         }
         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() + "登录");
         // 查询所有代理商
         List<TBranchOffice> agentList = branchOfficeService.selectList(new EntityWrapper<TBranchOffice>()
                 .ne("status", StatusEnum.DELETE.getCode())
@@ -436,8 +440,8 @@
     @RequestMapping("/statisticsByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsByAgentId(Integer agentId, String dayDate, String yearDate, String monthDate, Integer type, Model model) {
-        Integer objectId = ShiroKit.getUser().getObjectId();
-        Integer roleType = ShiroKit.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
         if(roleType == 2 && Objects.nonNull(objectId)){
             agentId = objectId;
         }
@@ -474,8 +478,8 @@
     @RequestMapping("/statisticsMonthByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsMonthByAgentId(Integer agentId, String dayDate,Model model) {
-        Integer objectId = ShiroKit.getUser().getObjectId();
-        Integer roleType = ShiroKit.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
         if(roleType == 2 && Objects.nonNull(objectId)){
             agentId = objectId;
         }
@@ -501,8 +505,8 @@
     @RequestMapping("/statisticsYearByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsYearByAgentId(Integer agentId, String yearDate,Model model) {
-        Integer objectId = ShiroKit.getUser().getObjectId();
-        Integer roleType = ShiroKit.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
         if(roleType == 2 && Objects.nonNull(objectId)){
             agentId = objectId;
         }
@@ -529,8 +533,8 @@
     @RequestMapping("/statisticsOrderByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsOrderByAgentId(Integer agentId, String monthDate,Integer type,Model model) {
-        Integer objectId = ShiroKit.getUser().getObjectId();
-        Integer roleType = ShiroKit.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
         if(roleType == 2 && Objects.nonNull(objectId)){
             agentId = objectId;
         }
@@ -572,8 +576,8 @@
     @RequestMapping("/statisticsDriverByAgentId")
     @ResponseBody
     public Map<String, Object> statisticsDriverByAgentId(Integer agentId,Model model) {
-        Integer objectId = ShiroKit.getUser().getObjectId();
-        Integer roleType = ShiroKit.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
         if(roleType == 2 && Objects.nonNull(objectId)){
             agentId = objectId;
         }

--
Gitblit v1.7.1