From 73e172462855da2c3ae893a02d2fb7e3cfd15ce2 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 29 Aug 2024 17:29:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervise/mapper/ClassifyMapper.java      |  2 +
 .../logpm/supervise/mapper/ClassifyMapper.xml |  4 ++
 .../service/impl/ClassifyServiceImpl.java     | 37 ++++++++++++-------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java
index 68b565715..8bfe5793f 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java
@@ -30,4 +30,6 @@ public interface ClassifyMapper extends BaseMapper<ClassifyEntity> {
 	List<ClassifyApiVO> selectAllClassifyList(@Param("pid") Long pid,@Param("list")List<Long> list);
 
 	List<ClassifyExportVO> exportList(@Param("param") ClassifyDTO classifyDTO);
+
+	List<ClassifyEntity> findAll();
 }
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
index 7a55b6322..87352026f 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
@@ -111,6 +111,10 @@
         </where>
         order by create_time desc
     </select>
+    <select id="findAll" resultType="com.logpm.supervise.entity.ClassifyEntity">
+        select *
+        from sup_classify
+    </select>
 
 
 </mapper>
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 8752d2a22..88483b939 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
@@ -119,6 +119,10 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		classifyDTO.setCreateDept(createDept);
 		classifyDTO.setExamineDeptName(examineDeptName);
 
+
+		 // 查询所有的分类
+		List<ClassifyEntity> all = baseMapper.findAll();
+
 		IPage<ClassifyVO> pages = baseMapper.pageList(page, classifyDTO);
 		List<ClassifyVO> records = pages.getRecords();
 
@@ -143,22 +147,27 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 			if (!"1".equals(isPid)) {
 				Long classifyId = record.getId();
 				Long pId1 = record.getPId();
-				ClassifyEntity classifyEntity = getById(pId1);
-				record.setParentClassifyName(classifyEntity.getName());
-				QueryWrapper<PointsEntity> queryWrapper = new QueryWrapper<>();
-				queryWrapper.eq("classify_id", classifyId)
-					.eq("is_deleted", 0);
-				List<PointsEntity> list = pointsService.list(queryWrapper);
-				String pointStr = "";
-				for (PointsEntity pointsEntity : list) {
-					if(StringUtil.isBlank(pointStr)){
-						pointStr = pointStr + pointsEntity.getPoint();
-					}else{
-						pointStr = pointStr + "," + pointsEntity.getPoint();
+
+				ClassifyEntity classifyEntity =all.stream().filter(item -> item.getId().equals(pId1)).findFirst().orElse(null);
+
+				if(classifyEntity!=null){
+					record.setParentClassifyName(classifyEntity.getName());
+					QueryWrapper<PointsEntity> queryWrapper = new QueryWrapper<>();
+					queryWrapper.eq("classify_id", classifyId)
+						.eq("is_deleted", 0);
+					List<PointsEntity> list = pointsService.list(queryWrapper);
+					String pointStr = "";
+					for (PointsEntity pointsEntity : list) {
+						if(StringUtil.isBlank(pointStr)){
+							pointStr = pointStr + pointsEntity.getPoint();
+						}else{
+							pointStr = pointStr + "," + pointsEntity.getPoint();
+						}
 					}
+					record.setPointStr(pointStr);
+					record.setPointsEntities(list);
 				}
-				record.setPointStr(pointStr);
-				record.setPointsEntities(list);
+
 			}
 		}