From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java
index cefeeba..f6d96b3 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java
@@ -32,10 +32,12 @@
public void editMgtShopProportion(MgtShopProportionEditDto mgtShopProportionEditDto){
//删除旧分成
ShopProportion shopProportionOld = this.getById(mgtShopProportionEditDto.getProportionId());
- shopProportionOld.setDelFlag(1);
- shopProportionOld.setUpdateUserId(mgtShopProportionEditDto.getUserId());
- shopProportionOld.setUpdateTime(new Date());
- this.saveOrUpdate(shopProportionOld);
+ if(shopProportionOld!=null){
+ shopProportionOld.setDelFlag(1);
+ shopProportionOld.setUpdateUserId(mgtShopProportionEditDto.getUserId());
+ shopProportionOld.setUpdateTime(new Date());
+ this.saveOrUpdate(shopProportionOld);
+ }
//创建新分成
ShopProportion shopProportionNew = new ShopProportion();
shopProportionNew.setDelFlag(0);
--
Gitblit v1.7.1