From 12d467a5d380f99d02bf7f15e6be83e284e95a7d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 26 五月 2026 17:43:55 +0800
Subject: [PATCH] feat: 办公用品(日常用品)，领用归还。领用归还记录 完成 ps:如果pro使用直接引入该commit
---
src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index 2b9eb40..222a9a4 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -89,9 +89,6 @@
@Override
public int addOrEditProduct(ProductDto productDto) {
- if (ObjectUtils.isEmpty(productDto.getParentId())) {
- throw new IllegalArgumentException("璇烽�夋嫨鐖惰妭鐐�");
- }
String productName = StringUtils.trim(productDto.getProductName());
if (StringUtils.isEmpty(productName)) {
throw new IllegalArgumentException("浜у搧鍚嶇О涓嶈兘涓虹┖");
@@ -100,15 +97,17 @@
checkProductNameUnique(productDto.getParentId(), productName, productDto.getId());
if (productDto.getId() == null) {
// 鏂板浜у搧閫昏緫
- // 妫�鏌ョ埗鑺傜偣鏄惁瀛樺湪锛堝彲閫夛紝鏍规嵁涓氬姟闇�姹傦級
- Product parent = productMapper.selectById(productDto.getParentId());
- if (parent == null) {
- throw new IllegalArgumentException("鐖惰妭鐐逛笉瀛樺湪锛屾棤娉曟坊鍔犲瓙浜у搧");
+ // 濡傛灉鏈夌埗鑺傜偣锛屾鏌ョ埗鑺傜偣鏄惁瀛樺湪
+ if (productDto.getParentId() != null) {
+ Product parent = productMapper.selectById(productDto.getParentId());
+ if (parent == null) {
+ throw new IllegalArgumentException("鐖惰妭鐐逛笉瀛樺湪锛屾棤娉曟坊鍔犲瓙浜у搧");
+ }
}
return productMapper.insert(productDto);
} else {
// 缂栬緫浜у搧閫昏緫
- // 妫�鏌ヤ骇鍝佹槸鍚﹀瓨鍦紙鍙�夛紝鏍规嵁涓氬姟闇�姹傦級
+ // 妫�鏌ヤ骇鍝佹槸鍚﹀瓨鍦�
Product existingProduct = productMapper.selectById(productDto.getId());
if (existingProduct == null) {
throw new IllegalArgumentException("瑕佺紪杈戠殑浜у搧涓嶅瓨鍦�");
@@ -119,10 +118,15 @@
private void checkProductNameUnique(Long parentId, String productName, Long currentId) {
LambdaQueryWrapper<Product> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Product::getParentId, parentId)
- .eq(Product::getProductName, productName)
- .ne(currentId != null, Product::getId, currentId)
- .last("limit 1");
+ queryWrapper.eq(Product::getProductName, productName)
+ .ne(currentId != null, Product::getId, currentId);
+ // 澶勭悊 parentId 涓� null 鐨勬儏鍐�
+ if (parentId == null) {
+ queryWrapper.isNull(Product::getParentId);
+ } else {
+ queryWrapper.eq(Product::getParentId, parentId);
+ }
+ queryWrapper.last("limit 1");
Product duplicateProduct = productMapper.selectOne(queryWrapper);
if (duplicateProduct != null) {
throw new IllegalArgumentException("瀵瑰簲鐨�" + productName + "宸茬粡瀛樺湪");
--
Gitblit v1.9.3