From e3b6e75c0b684d3cd079f5e3c3556aab50b4d707 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 26 Jan 2024 23:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/supervise/vo/ClassifyVO.java    |  2 ++
 .../service/impl/ClassifyServiceImpl.java     | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java
index 8784ea1bf..b5e069757 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java
@@ -37,5 +37,7 @@ public class ClassifyVO extends ClassifyEntity {
 
 	private List<PointsEntity> pointsEntities = new ArrayList<>();
 
+	private List<PointsVO> pointsVOS ;
+
 
 }
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index c608c9cae..9a18eb971 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -36,6 +36,7 @@ import com.logpm.supervise.service.IPointsService;
 import com.logpm.supervise.vo.ClassifyVO;
 import com.logpm.supervise.vo.IndicatorsVO;
 import com.logpm.supervise.vo.api.ClassifyApiVO;
+import com.logpm.supervise.wrapper.ClassifyWrapper;
 import com.logpm.supervise.wrapper.IndicatorsWrapper;
 import com.logpm.supervise.wrapper.PointsWrapper;
 import lombok.AllArgsConstructor;
@@ -48,6 +49,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -197,15 +199,24 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		List<ClassifyApiVO> classifyEntities = getClassifyList(pid);
 		for (ClassifyApiVO classifyEntity : classifyEntities) {
 			if (classifyEntity.getPId().equals(0L)){
-				List<ClassifyApiVO> classifyList = getClassifyList(classifyEntity.getId());
-				List<PointsEntity> list = pointsService.list(Wrappers.<PointsEntity>query().lambda()
-					.eq(PointsEntity::getClassifyId, classifyEntity.getId())
+				List<ClassifyApiVO> classifyList = new ArrayList<>();
+				List<ClassifyEntity> entityList = this.list(Wrappers.<ClassifyEntity>query().lambda()
+					.eq(ClassifyEntity::getPId, classifyEntity.getId())
+					.ne(ClassifyEntity::getPId, 0L)
 				);
-				if (!Objects.isNull(classifyList)){
-					classifyEntity.setChildren(classifyList);
+				for (ClassifyEntity entity : entityList) {
+					ClassifyVO classifyVO = ClassifyWrapper.build().entityVO(entity);
+					List<PointsEntity> list = pointsService.list(Wrappers.<PointsEntity>query().lambda()
+						.eq(PointsEntity::getClassifyId, classifyEntity.getId())
+					);
 					if(Func.isNotEmpty(list)){
-						classifyEntity.setPointsVOS(PointsWrapper.build().listVO(list));
+						classifyVO.setPointsVOS(PointsWrapper.build().listVO(list));
 					}
+					ClassifyApiVO copy = Func.copy(classifyVO, ClassifyApiVO.class);
+					classifyList.add(copy);
+				}
+				if (!Objects.isNull(classifyList)){
+					classifyEntity.setChildren(classifyList);
 				}
 			}
 		}