From ffe705d1fe2c4fa60d457f94b3e2be0cfeaf24c0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 15 六月 2025 01:58:30 +0800
Subject: [PATCH] 修改功能
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
index 8d5494e..e81bb93 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
@@ -5,6 +5,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.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
@@ -65,8 +66,8 @@
@RequestMapping("/list")
@ResponseBody
public Object list(String startTime, String endTime, Integer type, String merchantName, Integer status) {
-
- Integer companyId = ShiroKit.getUser().getObjectId();
+
+ Integer companyId = ShiroExtUtil.getUser().getObjectId();
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<Map<String, Object>> list = merchantActivityService.getMerchantActivityGiveList(startTime, endTime, type, merchantName, status, companyId, page);
@@ -228,8 +229,8 @@
@ResponseBody
@RequestMapping("/add")
public Object add(@RequestBody MerchantActivity activity) {
-
- Integer userId = ShiroKit.getUser().getId();
+
+ Integer userId = ShiroExtUtil.getUser().getId();
User user = userService.selectById(userId);
if (ToolUtil.isNotEmpty(user)) {
if (user.getRoleType().equals(2)) {
--
Gitblit v1.7.1