MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

import json small fixes

This commit is contained in:
CITE\amentis 2024-08-29 13:35:57 +03:00
parent 8354dd3b31
commit 759cfd9a77
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java
View File

@ -1769,8 +1769,8 @@ public class DescriptionServiceImpl implements DescriptionService {
persist.setTypeId(referenceTypeEntity.getId()); persist.setTypeId(referenceTypeEntity.getId());
if (referenceEntity == null) { if (referenceEntity == null) {
persist.setLabel(model.getLabel());
persist.setReference(!this.conventionService.isNullOrEmpty(model.getReference()) ? model.getReference() : UUID.randomUUID().toString()); persist.setReference(!this.conventionService.isNullOrEmpty(model.getReference()) ? model.getReference() : UUID.randomUUID().toString());
persist.setLabel(!this.conventionService.isNullOrEmpty(model.getLabel()) ? model.getLabel() : persist.getReference());
persist.setSource("internal"); persist.setSource("internal");
persist.setSourceType(ReferenceSourceType.Internal); persist.setSourceType(ReferenceSourceType.Internal);
} else { } else {

4
backend/core/src/main/java/org/opencdmp/service/plan/PlanServiceImpl.java
View File

@ -2740,8 +2740,8 @@ public class PlanServiceImpl implements PlanService {
persist.setTypeId(referenceTypeEntity.getId()); persist.setTypeId(referenceTypeEntity.getId());
if (referenceEntity == null) { if (referenceEntity == null) {
persist.setLabel(model.getLabel());
persist.setReference(!this.conventionService.isNullOrEmpty(model.getReference()) ? model.getReference() : UUID.randomUUID().toString()); persist.setReference(!this.conventionService.isNullOrEmpty(model.getReference()) ? model.getReference() : UUID.randomUUID().toString());
persist.setLabel(!this.conventionService.isNullOrEmpty(model.getLabel()) ? model.getLabel() : persist.getReference());
persist.setSource("internal"); persist.setSource("internal");
persist.setSourceType(ReferenceSourceType.Internal); persist.setSourceType(ReferenceSourceType.Internal);
} else { } else {
@ -2818,7 +2818,7 @@ public class PlanServiceImpl implements PlanService {
PlanContactPersist persist = new PlanContactPersist(); PlanContactPersist persist = new PlanContactPersist();
persist.setEmail(commonModel.getEmail()); persist.setEmail(commonModel.getEmail());
persist.setFirstName(commonModel.getEmail()); persist.setFirstName(commonModel.getFirstName());
persist.setLastName(commonModel.getLastName()); persist.setLastName(commonModel.getLastName());
return persist; return persist;