Revision 7950c5b2
Added by Katja Luther over 1 year ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java | ||
|---|---|---|
| 554 | 554 |
if (determination.getTaxonName().equals(taxon.getName()) || determination.getTaxon().equals(taxon)){
|
| 555 | 555 |
isAssociated = true; |
| 556 | 556 |
break; |
| 557 |
}else {
|
|
| 557 |
}else {
|
|
| 558 | 558 |
isAssociated = false; |
| 559 | 559 |
} |
| 560 | 560 |
} |
| 561 |
|
|
| 561 | 562 |
if (!isAssociated) {
|
| 562 | 563 |
continue; |
| 563 | 564 |
} |
| 564 | 565 |
derivativeDTO = (DerivedUnitDTO) SpecimenOrObservationDTOFactory.fromEntity(derivedUnit, null); |
| 565 | 566 |
alreadyCollectedUnits.put(derivativeDTO.getUuid(), derivativeDTO); |
| 566 |
derivativeDTO.addAllDerivatives(getDerivedUnitDTOsFor(derivativeDTO, derivedUnit, alreadyCollectedUnits)); |
|
| 567 |
//derivativeDTO.addAllDerivatives(getDerivedUnitDTOsFor(derivativeDTO, derivedUnit, alreadyCollectedUnits));
|
|
| 567 | 568 |
} |
| 568 | 569 |
derivativeDTO = (DerivedUnitDTO) alreadyCollectedUnits.get(unit.getUuid()); |
| 569 | 570 |
rootUnitDTOs.addAll(findRootUnitDTOs(derivativeDTO, alreadyCollectedUnits)); |
Also available in: Unified diff
ref #10137: improve derivate handling in dtos