Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

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

@@ -332,7 +332,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     private List<Long> selectTestScenarioList(Task task) {
         List<Long> list = new ArrayList<>();
         List<String> taskList = Arrays.asList(task.getTaskList().split(","));
-        if (taskList.contains(Task.SUB_TASK_TRFIS) && taskList.size() == 1) {
+        if (taskList.contains(Task.SUB_TASK_TRFIS) && taskList.size() == 1
+        || taskList.contains(Task.SUB_TASK_TRFIS) && taskList.contains(Task.SUB_TASK_SRAIF) && taskList.size() == 2) {
             list = taskScenarioRelationMapper
                     .selectList(new QueryWrapper<TaskScenarioRelation>().eq("task_id", task.getId()))
                     .stream()
@@ -704,7 +705,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
             if (request.getTaskList().contains(Task.SUB_TASK_TRFIS) &&
                 !request.getTaskList().contains(Task.SUB_TASK_GRFIS) &&
                 !request.getTaskList().contains(Task.SUB_TASK_SRAIF) &&
-                ObjectUtil.isNotNull(task.getModelTestTaskId())) {
+                ObjectUtil.isNotNull(task.getModelTestTaskId())
+                || request.getTaskList().contains(Task.SUB_TASK_TRFIS) &&
+                   !request.getTaskList().contains(Task.SUB_TASK_GRFIS) &&
+                   request.getTaskList().contains(Task.SUB_TASK_SRAIF) &&
+                   ObjectUtil.isNotNull(task.getModelTestTaskId())
+            ) {
                 TaskCreateRequest createRequest = new TaskCreateRequest();
                 BeanUtils.copyBeanProp(createRequest, request);
                 taskScenarioRelationMapper.delete(new QueryWrapper<TaskScenarioRelation>().lambda().eq(TaskScenarioRelation::getTaskId, task.getId()));