From f4894c44735012e51b7f3ade126b5bf9d7757202 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:37:34 +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 | 18 +++---------------
1 files changed, 3 insertions(+), 15 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 72699db..10dec84 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
@@ -170,29 +170,17 @@
// 处理用户权限过滤（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()));
}
- Integer operatorId = query.getOperatorId();
+
// 最终查询条件：storeIds为空时会返回空Page
Page<TSite> sitePage = tSiteService.page(page,
new LambdaQueryWrapper<TSite>()
--
Gitblit v1.7.1