From 103f10ed038b7398633b919f0efc5486f1e30267 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 21:18:27 +0800
Subject: [PATCH] feat: 交付日期修改为入库日期起始
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 9382134..893220a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -69,7 +69,9 @@
@Override
public List<ProductModel> selectModelList(ProductDto productDto) {
LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ProductModel::getProductId, productDto.getId());
+ if (productDto != null && productDto.getId() != null) {
+ queryWrapper.eq(ProductModel::getProductId, productDto.getId());
+ }
return productModelMapper.selectList(queryWrapper);
}
@@ -151,4 +153,11 @@
throw new ServiceException("瀵煎叆澶辫触");
}
}
+
+ @Override
+ public List<Product> getParentNames() {
+ LambdaQueryWrapper<Product> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.isNull(Product::getParentId).select(Product::getId, Product::getProductName);
+ return productMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.9.3