From d9a19736f24b597d76ea24d8803aaebfc8147291 Mon Sep 17 00:00:00 2001 From: winter <2436197699@qq.com> Date: Thu, 23 Nov 2023 16:02:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E5=85=81=E8=AE=B8=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/teammodel/model/entity/Evaluation.java | 4 ++-- .../java/cn/teammodel/model/entity/EvaluationTreeNode.java | 2 ++ .../java/cn/teammodel/service/impl/EvaluationServiceImpl.java | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/teammodel/model/entity/Evaluation.java b/src/main/java/cn/teammodel/model/entity/Evaluation.java index 1547dd1..fc6bcaf 100644 --- a/src/main/java/cn/teammodel/model/entity/Evaluation.java +++ b/src/main/java/cn/teammodel/model/entity/Evaluation.java @@ -3,8 +3,8 @@ package cn.teammodel.model.entity; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.GeneratedValue; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; -import lombok.ToString; import org.springframework.data.annotation.Id; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; */ @Container(containerName = "School") @Data -@ToString +@JsonInclude(JsonInclude.Include.NON_NULL) public class Evaluation { @Id @GeneratedValue diff --git a/src/main/java/cn/teammodel/model/entity/EvaluationTreeNode.java b/src/main/java/cn/teammodel/model/entity/EvaluationTreeNode.java index d71870e..4d2f0bb 100644 --- a/src/main/java/cn/teammodel/model/entity/EvaluationTreeNode.java +++ b/src/main/java/cn/teammodel/model/entity/EvaluationTreeNode.java @@ -1,6 +1,7 @@ package cn.teammodel.model.entity; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; @@ -8,6 +9,7 @@ import java.time.LocalDateTime; import java.util.List; @Data +@JsonInclude(JsonInclude.Include.NON_NULL) public class EvaluationTreeNode { String id; String pid; diff --git a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java index bc273a6..7748549 100644 --- a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java +++ b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java @@ -123,7 +123,6 @@ public class EvaluationServiceImpl implements EvaluationService { newNode.setCreateTime(LocalDateTime.now()); originNodes.add(newNode); - evaluation.setNodes(originNodes); // 好像不需要? return buildTree(evaluationRepository.save(evaluation)); }