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/DriverActivityServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
index 06d4769..3eb8433 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.DateUtil;
@@ -44,6 +45,9 @@
@Autowired
private IDriverActivityRegisteredService driverActivityRegisteredService;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
@Override
public List<Map<String, Object>> getList(Page<Map<String, Object>> page, String beginTime, String endTime, String name,
Integer companyType,
@@ -58,13 +62,13 @@
String[] timeArray = startTime.split(" - ");
Date startTimes = DateUtil.getDate_str3(timeArray[0]);
Date endTimes = DateUtil.getDate_str3(timeArray[1]);
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
Date nowDay = new Date();
//添加活动
DriverActivity driverActivity = new DriverActivity();
driverActivity.setInsertTime(nowDay);
- driverActivity.setCompanyId(ShiroKit.getUser().getObjectId());
- driverActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ driverActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ driverActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
driverActivity.setStatus(driverActivity.getCompanyType()==1?3:1);
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
@@ -139,14 +143,14 @@
String[] timeArray = startTime.split(" - ");
Date startTimes = DateUtil.getDate_str3(timeArray[0]);
Date endTimes = DateUtil.getDate_str3(timeArray[1]);
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
Date nowDay = new Date();
//添加活动
DriverActivity driverActivity = new DriverActivity();
driverActivity.setId(id);
- driverActivity.setCompanyId(ShiroKit.getUser().getObjectId());
- driverActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ driverActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ driverActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
driverActivity.setStatus(driverActivity.getCompanyType()==1?3:1);
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
--
Gitblit v1.7.1