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/TDriverServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index 421ac17..f61e6e1 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
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.core.util.DateUtil;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -83,6 +84,9 @@
@Autowired
private IDriverOnlineTimeService driverOnlineTimeService;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
private Logger log = LoggerFactory.getLogger(this.getClass());
@Override
public EntityWrapper<TDriver> getPageList(String createTime, String phone, Integer status) {
@@ -104,13 +108,13 @@
}
wrapper.orderBy(true,"approvalStatus");
// 判断是否为代理商或者分公司
- if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 2){
+ if(Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType() == 2){
// 分公司
- wrapper.eq("branchOfficeId",ShiroKit.getUser().getObjectId());
+ wrapper.eq("branchOfficeId",shiroExtUtil.getUser().getObjectId());
}
- if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
+ if(Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType() == 3){
// 代理商
- wrapper.eq("agentId",ShiroKit.getUser().getObjectId());
+ wrapper.eq("agentId",shiroExtUtil.getUser().getObjectId());
}
return wrapper;
}
@@ -391,13 +395,13 @@
}
wrapper.orderBy(true,"approvalStatus");
// 判断是否为代理商或者分公司
- if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 2){
+ if(Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType() == 2){
// 分公司
- wrapper.eq("branchOfficeId",ShiroKit.getUser().getObjectId());
+ wrapper.eq("branchOfficeId",shiroExtUtil.getUser().getObjectId());
}
- if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
+ if(Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType() == 3){
// 代理商
- wrapper.eq("agentId",ShiroKit.getUser().getObjectId());
+ wrapper.eq("agentId",shiroExtUtil.getUser().getObjectId());
}
return wrapper;
}
--
Gitblit v1.7.1