功能修改-sjx

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<FmProjectMilestoneEntity> oldStoneList = fmProjectMilestoneService.list(Wrappers.<FmProjectMilestoneEntity>lambdaQuery().eq(FmProjectMilestoneEntity::getPaId,fmProjectApplication.getId()));
-		List<Long> stoneIdList = oldStoneList.stream().map(BaseEntity::getId).collect(Collectors.toList());
-		fmProjectMilestoneService.deleteLogic(stoneIdList);
 		List<FmProjectMilestoneEntity> stoneList = fmProjectApplication.getStoneList();
-		stoneList.forEach(item -> {
-			item.setId(null);
-			item.setPaId(fmProjectApplication.getId());
-		});
-		fmProjectMilestoneService.saveBatch(stoneList);
+		if(CollectionUtils.isNotEmpty(stoneList)){
+			//子项全删全增
+			List<FmProjectMilestoneEntity> oldStoneList = fmProjectMilestoneService.list(Wrappers.<FmProjectMilestoneEntity>lambdaQuery().eq(FmProjectMilestoneEntity::getPaId,fmProjectApplication.getId()));
+			List<Long> 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));
 	}