From 100d67ddf6c3e4ae95756b4d74e845450fd52e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Tue, 16 Sep 2025 14:39:46 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TbPromotionMaterialServiceImpl.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java index 5fd332c..50291fa 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java @@ -113,10 +113,12 @@ public class TbPromotionMaterialServiceImpl implements ITbPromotionMaterialServi tbPromotionMaterial.setCreateUser(SecurityUtils.getUserId()); tbPromotionMaterial.setCreateTime(DateUtils.getNowDate()); int i = mapper.insertTbPromotionMaterial(tbPromotionMaterial); - if (tbPromotionMaterial.getProductId() != null && !tbPromotionMaterial.getProductId().isEmpty() && i > 0) { - //将产品与物料关系存到另一张表 - List split = tbPromotionMaterial.split(tbPromotionMaterial); - int n = mapper.insertMaterialProductRelevance(split); + if(i > 0){ + if (tbPromotionMaterial.getProductId() != null && !tbPromotionMaterial.getProductId().isEmpty()) { + //将产品与物料关系存到另一张表 + List split = tbPromotionMaterial.split(tbPromotionMaterial); + int n = mapper.insertMaterialProductRelevance(split); + } //将物料文件上传 int m = uploadFile(listFiles, "tb_promotion_material_files", tbPromotionMaterial.getId()); } @@ -135,12 +137,14 @@ public class TbPromotionMaterialServiceImpl implements ITbPromotionMaterialServi tbPromotionMaterial.setUpdateUser(SecurityUtils.getUserId()); tbPromotionMaterial.setUpdateTime(DateUtils.getNowDate()); int i = mapper.updateTbPromotionMaterial(tbPromotionMaterial); - if (tbPromotionMaterial.getProductId() != null && !tbPromotionMaterial.getProductId().isEmpty() && i > 0) { + if(i > 0){ //删除以前的关联关系 int x = mapper.deleteMaterialProductRelevance(tbPromotionMaterial.getId()); - //将产品与物料关系存到另一张表 - List split = tbPromotionMaterial.split(tbPromotionMaterial); - int n = mapper.insertMaterialProductRelevance(split); + if (tbPromotionMaterial.getProductId() != null && !tbPromotionMaterial.getProductId().isEmpty()) { + //将产品与物料关系存到另一张表 + List split = tbPromotionMaterial.split(tbPromotionMaterial); + int n = mapper.insertMaterialProductRelevance(split); + } if(listFiles != null && !listFiles.isEmpty()){ //删除以前的附件 if(tbPromotionMaterial.getDelIds() != null && !tbPromotionMaterial.getDelIds().isEmpty()){ @@ -155,6 +159,7 @@ public class TbPromotionMaterialServiceImpl implements ITbPromotionMaterialServi int m = uploadFile(listFiles, "tb_promotion_material_files", tbPromotionMaterial.getId()); } } + return i; }