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/TOrderServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 54bb372..d69f34f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.modular.system.controller.resp.DataStatisticsOrderYearResp;
import com.stylefeng.guns.modular.system.controller.resp.PerformanceTableResp;
@@ -53,6 +54,9 @@
@Resource
private TSystemConfigMapper systemConfigMapper;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
@Override
public List<TOrderResp> getOrderList(String createTime, String code, Integer source, String userName, String userPhone, Integer state, String driverName,Integer isException) {
String startTime = null;
@@ -63,8 +67,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();
return tOrderMapper.getOrderList(startTime,endTime,code,source,userName,userPhone,state,driverName,isException,roleType,objectId);
}
@@ -190,7 +194,7 @@
tSystemConfig.setBranchOfficeId(tDriver.getBranchOfficeId());
TSystemConfig tSystemConfig2 = systemConfigMapper.selectOne(tSystemConfig);
- if(Objects.nonNull(tSystemConfig1)){
+ if(Objects.nonNull(tSystemConfig2)){
JSONObject jsonObject2 = JSONObject.parseObject(tSystemConfig2.getContent());
Integer num24 = jsonObject2.getInteger("num4");
--
Gitblit v1.7.1