Browse Source

删除专题库时,把专题库所有任务删除

chendayu 2 years ago
parent
commit
ef7dba28a0
1 changed files with 1 additions and 3 deletions
  1. 1 3
      PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

+ 1 - 3
PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

@@ -532,9 +532,6 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
 
     @Transactional
     public String delete(Integer id) {
-        //专题库表删除数据
-        log.info("专题库表删除数据");
-        this.removeById(id);
         this.deleteProjectUser(id, loginUtils.getId());
         projectPatentLinkService.deleteByProjectId(id);
         projectFolderService.deleteByProjectId(id);
@@ -553,6 +550,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         if (taskConditionIds.size() > 0) {
             taskConditionService.removeByIds(taskConditionIds);
         }
+        this.removeById(id);
 
         return Response.success();
     }