From aff908fac4b654fd5bffa7b8031b3ff1eb4bf01f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 十一月 2025 17:04:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 24c18f3..1020aa5 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -429,9 +429,16 @@
try {
List<TStoreOtherConfigTrue> tStoreOtherConfigTrues = new ArrayList<>();
- List<TStoreOther> list = tStoreOtherService.list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id).eq(TStoreOther::getState, 1));
+ List<TStoreOther> list = tStoreOtherService
+ .list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id)
+ .eq(TStoreOther::getState, 1));
if (list.size() > 0) {
- tStoreOtherConfigTrues = tStoreOtherConfigTrueService.list(new LambdaQueryWrapper<TStoreOtherConfigTrue>().in(TStoreOtherConfigTrue::getPid, list.stream().map(TStoreOther::getId).collect(Collectors.toList())).eq(TStoreOtherConfigTrue::getState, 1));
+ tStoreOtherConfigTrues = tStoreOtherConfigTrueService
+ .list(new LambdaQueryWrapper<TStoreOtherConfigTrue>()
+ .in(TStoreOtherConfigTrue::getPid,
+ list.stream().map(TStoreOther::getId)
+ .collect(Collectors.toList()))
+ .eq(TStoreOtherConfigTrue::getState, 1));
}
for (TStoreOtherConfigTrue tStoreOtherConfigTrue : tStoreOtherConfigTrues) {
for (TStoreOther tStoreOther : list) {
--
Gitblit v1.7.1