From 06df28e9434e6b6287aa7aacf42a8a2e00f31454 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 21 五月 2026 09:28:20 +0800
Subject: [PATCH] null 调整
---
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 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 d93307c..99c2c17 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -169,7 +169,12 @@
//鍙嶅悜鏂板鎴愬搧浜у搧锛屽彧鏈夐攢鍞叧鑱旀柊澧炵殑鏃跺�欒皟鐢�
@Override
public Long productModelAnticlockwise(ProductModelAnticlockwiseDto productModelDto) {
- ProductModel oldProductModel = productModelMapper.selectOldProductModel(productModelDto.getModel(), productModelDto.getProductName());
+ ProductModel oldProductModel = new ProductModel();
+ if (ObjectUtils.isNotEmpty(productModelDto.getId())) {
+ oldProductModel = productModelMapper.selectById(productModelDto.getId());
+ }else {
+ oldProductModel = productModelMapper.selectOldProductModel(productModelDto.getModel(), productModelDto.getProductName());
+ }
//瀛樺湪灏辨洿鏂�
if (oldProductModel != null) {
oldProductModel.setModel(productModelDto.getModel());
@@ -184,6 +189,13 @@
}else {
//鎵惧埌鐖惰妭鐐�
Product productParent = productMapper.selectOne(new QueryWrapper<Product>().lambda().eq(Product::getProductName, "鎴愬搧").last("limit 1"));
+ if (ObjectUtils.isEmpty(productParent)) {
+ Product product = new Product();
+ product.setProductName("鎴愬搧");
+ product.setDeptId(SecurityUtils.getDeptId()[0]);
+ productMapper.insert(product);
+ productParent.setId(product.getId());
+ }
//鏂板浜у搧澶х被
Product product = new Product();
product.setProductName(productModelDto.getProductName());
--
Gitblit v1.9.3