From b63101272c43c01e6bf828b59d7d9c7e9d163983 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
index 43e8c5d..9e182ba 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
@@ -52,6 +53,9 @@
@Autowired
private IDriverActivityHistoryService driverActivityHistoryService;
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
/**
* 跳转到首页
@@ -229,7 +233,7 @@
@RequestMapping(value = "/list")
@ResponseBody
public Object list(String createTime,String name) {
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
String beginTime = null;
String endTime = null;
if (SinataUtil.isNotEmpty(createTime)){
--
Gitblit v1.7.1