From aad0c510e93d7cb13ee47802da905c48771dbc5a Mon Sep 17 00:00:00 2001
From: XLR_asd <xueyawei@seaskysh.com>
Date: Mon, 5 Jul 2021 17:46:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=20=E6=97=A5=E5=B8=B8=E7=94=B3=E6=8A=A5?=
=?UTF-8?q?=E4=B9=A6=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PlanBookSubjectRepositoryImpl.java | 4 +++-
.../PlanBookSubjectDetailConvert.java | 16 +++++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubject/PlanBookSubjectRepositoryImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubject/PlanBookSubjectRepositoryImpl.java
index bfd4027db..5259c01e3 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubject/PlanBookSubjectRepositoryImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubject/PlanBookSubjectRepositoryImpl.java
@@ -113,7 +113,9 @@ public class PlanBookSubjectRepositoryImpl implements PlanBookSubjectRepository
savePo(planBookSubjectPos.get(i));
projectDailyPlanAgg.getSubjectDetailList().get(i).setId(planBookSubjectPos.get(i).getId());
if (projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList() !=null){
- existDetail = true;
+ if (projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList().size() > 0){
+ existDetail = true;
+ }
}
}
//淇濆瓨缁忔祹绉戠洰鏄庣粏
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubjectdetail/PlanBookSubjectDetailConvert.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubjectdetail/PlanBookSubjectDetailConvert.java
index f07ae6a49..4e3ccabeb 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubjectdetail/PlanBookSubjectDetailConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/repository/projectplanbook/planbooksubjectdetail/PlanBookSubjectDetailConvert.java
@@ -50,15 +50,17 @@ public class PlanBookSubjectDetailConvert {
public static List<PlanBookSubjectDetailPo> DailyAggEntityListToPoList(ProjectDailyPlanAgg projectDailyPlanAgg) {
List<PlanBookSubjectDetailPo> poList = new ArrayList<>();
for (int i = 0; i < projectDailyPlanAgg.getSubjectDetailList().size(); i++) {
- if (!ObjectUtil.isNull(projectDailyPlanAgg.getSubjectDetailList().get(i)) && projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList().size() > 0) {
- List<PlanBookSubjectDetailPo> pos = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectDetailPo.class, projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList());
- if (pos.get(0).getId() == null) {
- for (PlanBookSubjectDetailPo po : pos) {
- po.setParentId(projectDailyPlanAgg.getSubjectDetailList().get(i).getId());
- po.setPlanBookId(projectDailyPlanAgg.getId());
+ if (!ObjectUtil.isNull(projectDailyPlanAgg.getSubjectDetailList().get(i))) {
+ if(projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList() != null && projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList().size() > 0) {
+ List<PlanBookSubjectDetailPo> pos = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectDetailPo.class, projectDailyPlanAgg.getSubjectDetailList().get(i).getSubjectDetailList());
+ if (pos.get(0).getId() == null) {
+ for (PlanBookSubjectDetailPo po : pos) {
+ po.setParentId(projectDailyPlanAgg.getSubjectDetailList().get(i).getId());
+ po.setPlanBookId(projectDailyPlanAgg.getId());
+ }
}
+ poList.addAll(pos);
}
- poList.addAll(pos);
}
}
return poList;
--
GitLab