From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java | 47 ++++++++++++++---------------------------------
1 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
index 98cb2b2..398d92d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
@@ -26,7 +26,7 @@
import java.util.stream.Collectors;
/**
- * 惠民卡控制器
+ * 玩湃惠民卡控制器
*
* @author fengshuonan
* @Date 2025-03-29 17:41:25
@@ -47,7 +47,7 @@
private ITSiteService tSiteService;
/**
- * 跳转到惠民卡首页
+ * 跳转到玩湃惠民卡首页
*/
@RequestMapping("")
public String index() {
@@ -55,7 +55,7 @@
}
/**
- * 跳转到添加惠民卡
+ * 跳转到添加玩湃惠民卡
*/
@RequestMapping("/tHuiminCard_add")
public String tHuiminCardAdd(Model model) {
@@ -75,7 +75,7 @@
}
/**
- * 获取惠民卡详情
+ * 获取玩湃惠民卡详情
*/
@RequestMapping("/getDetail")
@ResponseBody
@@ -87,7 +87,7 @@
/**
- * 获取惠民卡列表
+ * 获取玩湃惠民卡列表
* @return
*/
@RequestMapping(value = "/list")
@@ -168,34 +168,12 @@
storeIds.addAll(storeIdsByName);
}
- // 收集operatorId条件的storeIds（不提前返回null）
- Integer operatorId = query.getOperatorId();
- if (operatorId != null) {
- List<String> storeIdsByOperatorId = storeService.listObjs(
- new LambdaQueryWrapper<TStore>()
- .select(TStore::getId)
- .eq(TStore::getOperatorId, operatorId),
- String::valueOf);
- storeIds.addAll(storeIdsByOperatorId);
- }
// 处理用户权限过滤（objectType为2）
+ Integer operatorId = query.getOperatorId();
User user = UserExt.getUser();
if (user != null && user.getObjectType() == 2) {
- List<String> authorizedStoreIds = storeService.listObjs(
- new LambdaQueryWrapper<TStore>()
- .select(TStore::getId)
- .eq(TStore::getOperatorId, user.getObjectId()),
- String::valueOf);
- if (authorizedStoreIds.isEmpty()) {
- new Page();
- }
- if (storeIds.isEmpty()){
- storeIds.addAll(authorizedStoreIds);
- }else {
- storeIds.retainAll(new HashSet<>(authorizedStoreIds));
- }
-
+ operatorId = user.getObjectId();
}else if (user != null && user.getObjectType() == 3){
storeIds = new ArrayList<>();
storeIds.add(String.valueOf(user.getObjectId()));
@@ -207,6 +185,9 @@
Page<TSite> sitePage = tSiteService.page(page,
new LambdaQueryWrapper<TSite>()
.eq(!StringUtils.isEmpty(query.getProvinceCode()), TSite::getProvinceCode, query.getProvinceCode())
+ .eq(operatorId != null, TSite::getOperatorId, operatorId)
+ .ne(TSite::getState,3)
+ .eq(TSite::getSign,0)
.eq(!StringUtils.isEmpty(query.getCityCode()), TSite::getCityCode, query.getCityCode())
.in(!storeIds.isEmpty(), TSite::getStoreId, storeIds));
@@ -335,7 +316,7 @@
/* *//**
- * 跳转到修改惠民卡
+ * 跳转到修改玩湃惠民卡
*//*
@RequestMapping("/tHuiminCard_update/{tHuiminCardId}")
public String tHuiminCardUpdate(@PathVariable Integer tHuiminCardId, Model model) {
@@ -346,7 +327,7 @@
}
*//**
- * 获取惠民卡列表
+ * 获取玩湃惠民卡列表
*//*
@RequestMapping(value = "/list")
@ResponseBody
@@ -358,7 +339,7 @@
*//**
- * 修改惠民卡
+ * 修改玩湃惠民卡
*//*
@RequestMapping(value = "/update")
@ResponseBody
@@ -368,7 +349,7 @@
}
*//**
- * 惠民卡详情
+ * 玩湃惠民卡详情
*//*
@RequestMapping(value = "/detail/{tHuiminCardId}")
@ResponseBody
--
Gitblit v1.7.1