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/SysCouponRecordController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
index fa1e918..1ca740e 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
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.util.DateUtil;
@@ -37,6 +38,9 @@
@Autowired
private ISysCouponRecordService sysCouponRecordService;
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
/**
* 跳转到首页
@@ -90,8 +94,8 @@
if(SinataUtil.isNotEmpty(couponType)){
wrapper.eq("couponType",couponType);
}
- wrapper.eq("companyId",ShiroKit.getUser().getObjectId());
- wrapper.eq("companyType",ShiroKit.getUser().getRoleType());
+ wrapper.eq("companyId",shiroExtUtil.getUser().getObjectId());
+ wrapper.eq("companyType",shiroExtUtil.getUser().getRoleType());
wrapper.orderBy("id",false);
return super.packForBT(sysCouponRecordService.selectPage(page,wrapper));
}
@@ -103,8 +107,8 @@
@ResponseBody
public Object add(SysCouponRecord sysCouponRecord) {
sysCouponRecord.setInsertTime(new Date());
- sysCouponRecord.setCompanyId(ShiroKit.getUser().getObjectId());
- sysCouponRecord.setCompanyType(ShiroKit.getUser().getRoleType());
+ sysCouponRecord.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ sysCouponRecord.setCompanyType(shiroExtUtil.getUser().getRoleType());
sysCouponRecordService.insert(sysCouponRecord);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1