From 88a30d1fc3bc9660494130e7b393711e3f9aefce Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 10:31:00 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
index 952197d..ff51431 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
@@ -170,12 +170,12 @@
.eq(goodsType != null, Goods::getType, goodsType)
.eq(categoryId != null, Goods::getGoodsCategoryId, categoryId));
List<Integer> goodsIds = goodsList.stream().map(Goods::getId).collect(Collectors.toList());
- if (goodsId != null){
- goodsIds.add(goodsId);
+ if (goodsId == null){
+ return R.ok();
}
Page<GoodsBargainPrice> page = goodsBargainPriceService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsBargainPrice>()
- .eq(!CollectionUtils.isEmpty(goodsIds), GoodsBargainPrice::getGoodsId, goodsId)
+ .in(!CollectionUtils.isEmpty(goodsIds), GoodsBargainPrice::getGoodsId, goodsIds)
.eq(auditStatus != null, GoodsBargainPrice::getAuditStatus, auditStatus));
page.getRecords().forEach(goodsBargainPrice -> goodsList.stream()
--
Gitblit v1.7.1