MaDgiK-CITE
/
file-transformer-docx
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

This commit is contained in:
CITE\amentis 2024-09-26 17:06:29 +03:00
parent f0db67d3e0
commit 5846a378b8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/opencdmp/filetransformer/docx/service/wordfiletransformer/word/WordBuilderImpl.java
View File

@ -673,8 +673,7 @@ public class WordBuilderImpl implements WordBuilder {
String label = "";
if (referenceModel.getLabel() != null && !referenceModel.getLabel().isBlank()) {
label = referenceModel.getLabel();
}
if (referenceModel.getDescription() != null && !referenceModel.getDescription().isBlank()) {
} else if (referenceModel.getDescription() != null && !referenceModel.getDescription().isBlank()) {
label = (label.isBlank() ? "" : " ") + referenceModel.getDescription();
}
ReferenceFieldModel fieldModel = referenceModel.getDefinition() != null && referenceModel.getDefinition().getFields() != null && !referenceModel.getDefinition().getFields().isEmpty() ? referenceModel.getDefinition().getFields().stream().filter(x -> x.getCode().equals("pidTypeField")).findFirst().orElse(null) : null;
@ -810,8 +809,7 @@ public class WordBuilderImpl implements WordBuilder {
String label = "";
if (referenceModel.getLabel() != null && !referenceModel.getLabel().isBlank()) {
label = referenceModel.getLabel();
}
if (referenceModel.getDescription() != null && !referenceModel.getDescription().isBlank()) {
} else if (referenceModel.getDescription() != null && !referenceModel.getDescription().isBlank()) {
label = (label.isBlank() ? "" : " ") + referenceModel.getDescription();
}
if (!label.isBlank()) values.add(label);