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/controller/checkCar/TCheckCarActivityController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/checkCar/TCheckCarActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/checkCar/TCheckCarActivityController.java
index 676d6bb..fd1c960 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/checkCar/TCheckCarActivityController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/checkCar/TCheckCarActivityController.java
@@ -4,6 +4,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
@@ -68,6 +69,9 @@
@Value("wx.conf.appId")
private String appId;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到代检车活动首页
@@ -75,8 +79,8 @@
@RequestMapping("")
public String index(Model model) {
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
TBranchOffice tBranchOffice = branchOfficeService.selectById(objectId);
if (roleType == 1) {
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
@@ -110,8 +114,8 @@
@RequestMapping("/tCheckCarActivity_add")
public String tCheckCarActivityAdd(Model model) {
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
@@ -150,8 +154,8 @@
DateUtil.format(tCheckCarActivity.getEndTime(), DatePattern.NORM_DATE_FORMAT);
tCheckCarActivity.setTimeRange(timeRange);
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
@@ -262,8 +266,8 @@
tCheckCarActivity.setAuditTimeFormat(DateUtil.format(tCheckCarActivity.getAuditTime(), DatePattern.NORM_DATETIME_FORMAT));
}
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
@@ -314,8 +318,8 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TCheckCarActivity tCheckCarActivity) {
- tCheckCarActivity.setBranchOfficeId(ShiroKit.getUser().getObjectId());
- tCheckCarActivity.setCreateBy(ShiroKit.getUser().getName());
+ tCheckCarActivity.setBranchOfficeId(shiroExtUtil.getUser().getObjectId());
+ tCheckCarActivity.setCreateBy(shiroExtUtil.getUser().getName());
TRegion distinct = regionService.selectOne(new EntityWrapper<TRegion>().eq("code", tCheckCarActivity.getDistrictCode()));
if (distinct != null) {
tCheckCarActivity.setDistrictName(distinct.getName());
@@ -350,7 +354,7 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TCheckCarActivity tCheckCarActivity) {
- tCheckCarActivity.setUpdateBy(ShiroKit.getUser().getName());
+ tCheckCarActivity.setUpdateBy(shiroExtUtil.getUser().getName());
TRegion distinct = regionService.selectOne(new EntityWrapper<TRegion>().eq("code", tCheckCarActivity.getDistrictCode()));
if (distinct != null) {
tCheckCarActivity.setDistrictName(distinct.getName());
@@ -409,8 +413,8 @@
tCheckCarActivity.setTimeRange(timeRange);
// 查询当前帐号的省市区
- Integer objectId = ShiroKit.getUser().getObjectId();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 1){
List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
--
Gitblit v1.7.1