From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 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 5a6ed10..72699db 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
@@ -168,16 +168,6 @@
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）
User user = UserExt.getUser();
@@ -202,11 +192,12 @@
}
-
+ Integer operatorId = query.getOperatorId();
// 最终查询条件：storeIds为空时会返回空Page
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())
--
Gitblit v1.7.1