From a611582e80cb21e6156f366f644af909ae4f5934 Mon Sep 17 00:00:00 2001 From: fengguangyu <841028466@qq.com> Date: Thu, 1 Jul 2021 18:39:23 +0800 Subject: [PATCH] =?UTF-8?q?ProjectInfoPlanAgg=20cmdToDailyAgg=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20null=20=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/assembler/ProjectPlanAssembler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/assembler/ProjectPlanAssembler.java b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/assembler/ProjectPlanAssembler.java index 7fa9f3d9..ca862d50 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/application/command/assembler/ProjectPlanAssembler.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/application/command/assembler/ProjectPlanAssembler.java @@ -1,5 +1,6 @@ package com.seasky.projectplan.application.command.assembler; +import cn.hutool.core.util.ObjectUtil; import com.seasky.core.ddd.utils.MapperUtils; import com.seasky.projectplan.domain.aggregate.projectInfoplan.ProjectInfoPlanAgg; import com.seasky.projectplan.domain.aggregate.projectInfoplan.ProjectTargetEntity; @@ -49,8 +50,10 @@ public class ProjectPlanAssembler { ProjectDailyPlanAgg agg = MapperUtils.INSTANCE.map(ProjectDailyPlanAgg.class, cmd); for (PlanSubjectCmd planSubjectCmd : cmd.getPlanSubjectList()) { com.seasky.projectplan.domain.aggregate.projectdailyplan.PlanSubjectEntity planSubjectEntity = MapperUtils.INSTANCE.map(PlanSubjectEntity.class, planSubjectCmd); - List<com.seasky.projectplan.domain.aggregate.projectdailyplan.SubjectDetailEntity> detailEntities = MapperUtils.INSTANCE.mapAsList(SubjectDetailEntity.class, planSubjectCmd.getSubjectDetailList()); - planSubjectEntity.setSubjectDetailList(detailEntities); + if (!ObjectUtil.isNull(planSubjectCmd.getSubjectDetailList())){ + List<com.seasky.projectplan.domain.aggregate.projectdailyplan.SubjectDetailEntity> detailEntities = MapperUtils.INSTANCE.mapAsList(SubjectDetailEntity.class, planSubjectCmd.getSubjectDetailList()); + planSubjectEntity.setSubjectDetailList(detailEntities); + } agg.getSubjectDetailList().add(planSubjectEntity); } return agg; -- GitLab