diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustBackServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustBackServiceImpl.java index 6911f8f..b403c20 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustBackServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustBackServiceImpl.java @@ -22,6 +22,7 @@ import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordSer import com.chinaunicom.mall.ebtp.project.projectsection.service.IProjectSectionService; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -103,6 +104,7 @@ public class ProjectEntrustBackServiceImpl extends ServiceImpl queryWrapper = Wrappers.lambdaQuery(); @@ -525,7 +526,6 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl recordList = projectRecordService.list(recordQueryWrapper); - this.removeById(delProjectEntrust.getId()); if(!CollectionUtils.isEmpty(recordList)){ long recordCount = recordList.stream().filter(n -> n.getStatus() > 1).count(); ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_RECORD_NOT_BACK.customValid(recordCount > 0); @@ -539,8 +539,10 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl().eq(ProjectSection::getProjectId,record.getId())); } + entrustBack.setDeleteData(deleteData); entrustBackService.save(entrustBack); + this.removeById(delProjectEntrust.getId()); } return true; }