fix(解决冲突): 解决taskserviceimpl冲突

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -642,6 +642,7 @@ public class TaskServiceImpl implements TaskService {
                         .filter(taskUserVo -> !Collections.disjoint(idLists, taskUserVo.getInvolveUserIdList())||(taskUserVo.getCreateUserId()!=null&&idLists.contains(taskUserVo.getCreateUserId())))
                         .collect(Collectors.toList());
             }
+
             if (taskSelectVo.getAreaId()!=null){
                 List<Integer> ids = areaService.findIdQuerySubordinateIds(taskSelectVo.getAreaId());
                 List<Integer>  unitIds = unitsDao.findAllByAreaIdIn(ids).stream().map(Units::getUnitId).collect(Collectors.toList());

dev-train/src/main/java/com/tykj/dev/device/train/entity/TrainTheme.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 import org.modelmapper.ModelMapper;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
@@ -35,6 +36,7 @@ import java.util.List;
 @EntityListeners(AuditingEntityListener.class)
 @Data
 @Entity
+@Where(clause = "delete_tag = 0")
 public class TrainTheme {
     /**
      * 培训id