From 25cf266e99714ac5d428e66b40ce272325c91dd8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 14 六月 2025 15:01:11 +0800
Subject: [PATCH] 修改管理后台账号和共享session等 屏蔽除出租车外的其他模块
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
index 56efea8..45d4d0f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityController.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.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
@@ -69,7 +70,7 @@
@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.list(startTime, endTime, type, merchantName, status, companyId, page);
@@ -138,8 +139,8 @@
@RequestMapping("/add")
@ResponseBody
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)) {
@@ -354,12 +355,12 @@
@RequestMapping("/activityExamineList")
@ResponseBody
public Object activityExamineList(String startTime, String endTime, Integer type, Integer auditStatus) {
-
+
Integer companyId = null;
- if (ShiroKit.getUser().getRoleType().equals(1)) {
- companyId = ShiroKit.getUser().getObjectId();
+ if (ShiroExtUtil.getUser().getRoleType().equals(1)) {
+ companyId = ShiroExtUtil.getUser().getObjectId();
}
-
+
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<Map<String, Object>> list = merchantActivityService.activityExamineList(startTime, endTime, type, auditStatus, companyId, page);
page.setRecords(list);
@@ -403,8 +404,8 @@
public Object examine(Integer id, Integer state, String auditNote) {
MerchantActivity activity = merchantActivityService.selectById(id);
-
- Integer userId = ShiroKit.getUser().getId();
+
+ Integer userId = ShiroExtUtil.getUser().getId();
User user = userService.selectById(userId);
if (ToolUtil.isNotEmpty(activity)) {
--
Gitblit v1.7.1