From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
index e29b78c..b3717ad 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
@@ -51,17 +51,15 @@
*/
@Override
public Page<ProductMaterialSkuDto> productMaterialSkuList(Page<ProductMaterialSku> page, ProductMaterialSkuDto dto) {
- if (dto == null || dto.getMaterialId() == null) {
- return new Page<>();
- }
LambdaQueryWrapper<ProductMaterialSku> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ProductMaterialSku::getMaterialId, dto.getMaterialId())
- .like(StringUtils.isNotBlank(dto.getSpecification()),
- ProductMaterialSku::getSpecification, dto.getSpecification())
- .like(StringUtils.isNotBlank(dto.getMaterialCode()),
- ProductMaterialSku::getMaterialCode, dto.getMaterialCode())
- .orderByAsc(ProductMaterialSku::getId);
-
+ if (dto != null && dto.getMaterialId() != null) {
+ queryWrapper.eq(ProductMaterialSku::getMaterialId, dto.getMaterialId())
+ .like(StringUtils.isNotBlank(dto.getSpecification()),
+ ProductMaterialSku::getSpecification, dto.getSpecification())
+ .like(StringUtils.isNotBlank(dto.getMaterialCode()),
+ ProductMaterialSku::getMaterialCode, dto.getMaterialCode())
+ .orderByAsc(ProductMaterialSku::getId);
+ }
Page<ProductMaterialSku> skuPage = this.page(page, queryWrapper);
List<ProductMaterialSku> skuList = skuPage.getRecords();
if (skuList == null || skuList.isEmpty()) {
--
Gitblit v1.9.3