From cf4b85781a7be692ca1738f4163d790f32132abd Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 13 May 2026 14:25:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FmProjectApplicationController.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectApplicationController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectApplicationController.java index b0f7518a..a46b67ef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectApplicationController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectApplicationController.java @@ -27,6 +27,7 @@ package org.springblade.desk.process.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; @@ -138,16 +139,20 @@ public class FmProjectApplicationController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入fmProjectApplication") public R update(@Valid @RequestBody FmProjectApplicationEntity fmProjectApplication) { - //子项全删全增 - List oldStoneList = fmProjectMilestoneService.list(Wrappers.lambdaQuery().eq(FmProjectMilestoneEntity::getPaId,fmProjectApplication.getId())); - List stoneIdList = oldStoneList.stream().map(BaseEntity::getId).collect(Collectors.toList()); - fmProjectMilestoneService.deleteLogic(stoneIdList); List stoneList = fmProjectApplication.getStoneList(); - stoneList.forEach(item -> { - item.setId(null); - item.setPaId(fmProjectApplication.getId()); - }); - fmProjectMilestoneService.saveBatch(stoneList); + if(CollectionUtils.isNotEmpty(stoneList)){ + //子项全删全增 + List oldStoneList = fmProjectMilestoneService.list(Wrappers.lambdaQuery().eq(FmProjectMilestoneEntity::getPaId,fmProjectApplication.getId())); + List stoneIdList = oldStoneList.stream().map(BaseEntity::getId).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(stoneIdList)){ + fmProjectMilestoneService.deleteLogic(stoneIdList); + } + stoneList.forEach(item -> { + item.setId(null); + item.setPaId(fmProjectApplication.getId()); + }); + fmProjectMilestoneService.saveBatch(stoneList); + } return R.status(fmProjectApplicationService.updateById(fmProjectApplication)); }