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/service/impl/TRevenueServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
index 63e961a..ee93526 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.modular.system.controller.resp.PerformanceTableResp;
 import com.stylefeng.guns.modular.system.controller.resp.RevenueExpenditureResp;
@@ -47,6 +48,9 @@
     @Autowired
     private ITEvaluateService tEvaluateService;
 
+    @Autowired
+    private ShiroExtUtil shiroExtUtil;
+
     @Override
     public List<RevenueExpenditureResp> getPageList(String code, Integer businessType, Integer payType, String driverName, String businessTime,Integer branchOfficeId) {
         String startTime = null;
@@ -57,8 +61,8 @@
             startTime = split[0] + " 00:00:00";
             endTime = split[1] + " 23:59:59";
         }
-        Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
-        Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+        Integer roleType = Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType();
+        Integer objectId = Objects.requireNonNull(shiroExtUtil.getUser()).getObjectId();
         if(Objects.nonNull(branchOfficeId)){
             objectId = branchOfficeId;
             roleType = 2;

--
Gitblit v1.7.1