#106 change boolean to nullable
This commit is contained in:
parent
5a55e3cfc8
commit
6c8554a0b8
@ -20,7 +20,7 @@ public class FileData extends BaseEntity {
|
||||
private byte[] data;
|
||||
|
||||
@Column(name = "is_latex_attach")
|
||||
private boolean isLatexAttach;
|
||||
private Boolean isLatexAttach;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
@ -54,11 +54,11 @@ public class FileData extends BaseEntity {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
public boolean isLatexAttach() {
|
||||
public Boolean isLatexAttach() {
|
||||
return isLatexAttach;
|
||||
}
|
||||
|
||||
public void setLatexAttach(boolean latexAttach) {
|
||||
public void setLatexAttach(Boolean latexAttach) {
|
||||
isLatexAttach = latexAttach;
|
||||
}
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ public class FileDataDto {
|
||||
private String fileName;
|
||||
private String tmpFileName;
|
||||
private boolean deleted;
|
||||
private boolean isLatexAttach;
|
||||
private Boolean isLatexAttach;
|
||||
|
||||
public FileDataDto() {
|
||||
}
|
||||
@ -17,7 +17,7 @@ public class FileDataDto {
|
||||
@JsonCreator
|
||||
public FileDataDto(@JsonProperty("id") Integer id,
|
||||
@JsonProperty("name") String name,
|
||||
@JsonProperty("isLatexAttach") boolean isLatexAttach,
|
||||
@JsonProperty("isLatexAttach") Boolean isLatexAttach,
|
||||
@JsonProperty("fileName") String fileName,
|
||||
@JsonProperty("tmpFileName") String tmpFileName) {
|
||||
this.id = id;
|
||||
@ -77,19 +77,19 @@ public class FileDataDto {
|
||||
this.deleted = deleted;
|
||||
}
|
||||
|
||||
public boolean isLatexAttach() {
|
||||
public Boolean isLatexAttach() {
|
||||
return isLatexAttach;
|
||||
}
|
||||
|
||||
public boolean getIsLatexAttach() {
|
||||
public Boolean getIsLatexAttach() {
|
||||
return isLatexAttach;
|
||||
}
|
||||
|
||||
public void setLatexAttach(boolean latexAttach) {
|
||||
public void setLatexAttach(Boolean latexAttach) {
|
||||
isLatexAttach = latexAttach;
|
||||
}
|
||||
|
||||
public void setIsLatexAttach(boolean latexAttach) {
|
||||
public void setIsLatexAttach(Boolean latexAttach) {
|
||||
isLatexAttach = latexAttach;
|
||||
}
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ public class FileService {
|
||||
public void createLatexAttachs(PaperDto paper) throws IOException {
|
||||
for (FileDataDto fileDataDto : paper.getFiles()
|
||||
.stream()
|
||||
.filter(f -> f.isLatexAttach() && !f.isDeleted())
|
||||
.filter(f -> (f.isLatexAttach()!=null && f.isLatexAttach()) && !f.isDeleted())
|
||||
.collect(Collectors.toList())) {
|
||||
if (fileDataDto.getId() == null) {
|
||||
File oldFile = getTmpFilePath(fileDataDto.getTmpFileName()).toFile();
|
||||
|
@ -8,7 +8,7 @@
|
||||
<div th:fragment="filesList (isLatexAttach)" th:remove="tag">
|
||||
<th:block th:each="file, rowStat : *{files}">
|
||||
|
||||
<span th:if="${file.isLatexAttach == isLatexAttach}" th:remove="tag">
|
||||
<span th:if="${(!isLatexAttach and file.isLatexAttach == null) or file.isLatexAttach == isLatexAttach}" th:remove="tag">
|
||||
|
||||
<div class="row" th:id="|files${rowStat.index}|"
|
||||
th:style="${file.deleted} ? 'display: none;' :''">
|
||||
|
Loading…
Reference in New Issue
Block a user