diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java index 5df51e1c9..42ad26ba7 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java @@ -308,13 +308,15 @@ public class EntityLogService { entity.get().setLegalBasis(forceRedaction.getLegalBasis()); entity.get().setState(EntryState.APPLIED); addChanges(entity.get().getChanges(), ChangeType.CHANGED, entityLog.getAnalysisNumber()); - entity.get().getManualChanges().add(ManualChange.builder() + var forceRedactManualChange = ManualChange.builder() .manualRedactionType(ManualRedactionType.FORCE_REDACT) .requestedDate(forceRedaction.getRequestDate()) .processedDate(forceRedaction.getProcessedDate()) - .userId(forceRedaction.getUser()) - .propertyChanges(Map.of("legalBasis", forceRedaction.getLegalBasis())) - .build()); + .userId(forceRedaction.getUser()); + if (forceRedaction.getLegalBasis() != null && !forceRedaction.getLegalBasis().isEmpty()) { + forceRedactManualChange.propertyChanges(Map.of("legalBasis", forceRedaction.getLegalBasis())); + } + entity.get().getManualChanges().add(forceRedactManualChange.build()); } }); }