Merge branch 'wangdingyi' into 'dev'

创建总任务

See merge request !235

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -121,20 +121,28 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
 
             // 删除暂存任务与整车样品的信息
             List<TaskSampleRelation> sampleRelations = taskSampleRelationService.selectByTaskId(temporaryStorageTask.getId(),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
+            if (sampleRelations != null && sampleRelations.size() != 0) {
                 taskSampleRelationService.removeBatchByIds(sampleRelations);
+            }
 
             // 删除暂存任务与零件样品的信息
             List<TaskSampleRelation> partRelationList = taskSampleRelationService.selectByTaskId(temporaryStorageTask.getId(),TaskSampleRelation.PART_VEHICLE_SAMPLE);
+            if (partRelationList != null && partRelationList.size() != 0) {
                 taskSampleRelationService.removeBatchByIds(partRelationList);
+            }
 
             // 删除暂存任务与小组的信息
             List<TaskUserRelation> list = taskUserRelationService.selectQTeamMembers(temporaryStorageTask.getId());
+            if (list != null && list.size() != 0) {
                 taskUserRelationService.removeBatchByIds(list);
+            }
 
             // 删除暂存任务与文件的信息
             List<TaskFileRelation> fileRelations = taskFileRelationService.findByTaskId(temporaryStorageTask.getId());
+            if (fileRelations != null && fileRelations.size() != 0) {
                 taskFileRelationService.removeBatchByIds(fileRelations);
             }
+        }
 
         Long sum = taskMapper.findTaskName(request.getTaskName());