From aa6ffcaae173e0ba6372c90261b8a7d4b1fd6052 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:07:17 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
index 5574654..3449772 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java
@@ -144,7 +144,8 @@
queryWrapper.eq(ShopTask::getTaskStatus,1);
queryWrapper.eq(ShopTask::getTaskDate,DateUtils.getDate());
if(null != userIds && userIds.size() > 0){
- List<Shop> list = shopService.list(new QueryWrapper<Shop>().eq("del_flag", 0).in("belong_user_id", userIds));
+ List<Shop> list = shopService.list(new QueryWrapper<Shop>().eq("del_flag", 0)
+ .in("belong_user_id", userIds));
List<Long> collect = list.stream().map(Shop::getShopId).collect(Collectors.toList());
queryWrapper.in(ShopTask::getShopId, collect);
}
--
Gitblit v1.7.1