From 69cd4b8d0cb96570d6d1f32abe02100d1e196b6c Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Wed, 16 Feb 2022 13:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=92=A4=E5=9B=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=E5=A2=9E=E5=8A=A0=E6=9C=AC=E5=9C=B0=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectEntrustBackServiceImpl.java           | 2 ++
 .../service/impl/ProjectEntrustServiceImpl.java               | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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<ProjectEntrustBac
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean recall(String id) {
         ProjectEntrustBack entrustBack = this.getById(id);
 
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
index 224f00a..9cd715d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
@@ -494,6 +494,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean deleteProjectEntrust(Long ebpProjectId,String reason) {
 
         LambdaQueryWrapper<ProjectEntrust> queryWrapper = Wrappers.lambdaQuery();
@@ -525,7 +526,6 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
             recordQueryWrapper.eq(ProjectRecord::getEntrustId, delProjectEntrust.getId());
             List<ProjectRecord> 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<ProjectEntrustMap
                 projectRecordService.removeById(record.getId());
                 sectionService.remove(new LambdaQueryWrapper<ProjectSection>().eq(ProjectSection::getProjectId,record.getId()));
             }
+
             entrustBack.setDeleteData(deleteData);
             entrustBackService.save(entrustBack);
+            this.removeById(delProjectEntrust.getId());
         }
         return true;
     }