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/TBranchOfficeServiceImpl.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/TBranchOfficeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
index b89f6ad..be735ae 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.stylefeng.guns.core.base.tips.SuccessTip;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.modular.system.controller.resp.TBranchOfficeResp;
 import com.stylefeng.guns.modular.system.dao.*;
@@ -54,6 +55,9 @@
     private TAgentMapper tAgentMapper;
     @Autowired
     private TBranchOfficeAreaMapper branchOfficeAreaMapper;
+
+    @Autowired
+    private ShiroExtUtil shiroExtUtil;
 
     @Override
     public void tBranchOfficeDetail(Integer tBranchOfficeId, Model model) {
@@ -138,8 +142,8 @@
         wrapper.ne("status", StatusEnum.DELETE.getCode());
         wrapper.orderBy("createTime",false);
         // 判断代理商 分公司
-        Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
-        Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+        Integer roleType = shiroExtUtil.getUser().getRoleType();
+        Integer objectId = shiroExtUtil.getUser().getObjectId();
         if(2 == roleType){
             // 分公司
             wrapper.eq("id",objectId);

--
Gitblit v1.7.1