From 6fd0925977dc19bfd094f17b816e77a79baba620 Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Tue, 25 Feb 2025 10:42:58 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/AdminIndexDutyServiceImpl.java | 2 +- .../cn/teammodel/model/entity/appraise/AppraiseTreeNode.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/AdminIndexDutyServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/AdminIndexDutyServiceImpl.java index 9d27b9b..f602225 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/AdminIndexDutyServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/AdminIndexDutyServiceImpl.java @@ -234,7 +234,7 @@ public class AdminIndexDutyServiceImpl implements AdminIndexDutyService { lessonRecordDto.setSubjectId(subjectIds); if(subjectIds.isEmpty()) { - return null; + return new HashMap<>(); } } mapper = GroupUtil.getGroupId(lessonRecordDto,new GroupUtil(env), request,url); diff --git a/src/main/java/cn/teammodel/model/entity/appraise/AppraiseTreeNode.java b/src/main/java/cn/teammodel/model/entity/appraise/AppraiseTreeNode.java index 02f7bbf..9311d7e 100644 --- a/src/main/java/cn/teammodel/model/entity/appraise/AppraiseTreeNode.java +++ b/src/main/java/cn/teammodel/model/entity/appraise/AppraiseTreeNode.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -31,5 +32,5 @@ public class AppraiseTreeNode { @JsonProperty("isPraise") boolean isPraise; - List children; + List children = new ArrayList<>(); }