From 78098d622fc2b31e562fd0b97e2c24e53b6da836 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 29 Jan 2024 10:56:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8C=87=E6=A0=87=E7=AE=A1=E7=90=86=20=20?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E6=8C=87=E6=A0=87=E5=88=86=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/logpm/supervise/vo/ClassifyVO.java | 2 ++ .../com/logpm/supervise/service/impl/ClassifyServiceImpl.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) 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..409f966d0 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 @@ -35,6 +35,8 @@ import java.util.List; public class ClassifyVO extends ClassifyEntity { private static final long serialVersionUID = 1L; + private String parentClassifyName; + private List pointsEntities = new ArrayList<>(); 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 f42b91afd..e22419f1f 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 @@ -51,7 +51,6 @@ import org.springblade.core.tool.utils.Func; import org.springblade.system.entity.Dept; import org.springblade.system.entity.User; import org.springblade.system.feign.IDeptClient; -import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -110,6 +109,9 @@ public class ClassifyServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("classify_id",classifyId) .eq("is_deleted",0);