From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
index 8206486..da08684 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java
@@ -18,10 +18,12 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.jfpt.catalog.entitly.catalog;
import org.springblade.jfpt.catalog.mapper.catalogMapper;
import org.springblade.jfpt.catalog.service.catalogService;
import org.springblade.jfpt.catalog.vo.catalogVO;
+import org.springblade.system.vo.DeptVO;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -42,8 +44,8 @@
}
@Override
- public List selectCatalogEqNUmber(String pid) {
- return baseMapper.selectCatalogEqNUmber(pid);
+ public List selectCatalogEqNUmber(String id) {
+ return baseMapper.selectCatalogEqNUmber(id);
}
@Override
@@ -70,4 +72,19 @@
public List<catalogVO> lazyTree(String tenantId, Long parentId) {
return baseMapper.lazyTree(tenantId, parentId);
}
+
+ @Override
+ public List<catalogVO> tree() {
+ return ForestNodeMerger.merge(baseMapper.tree());
+ }
+
+ @Override
+ public void updateCatalog(String name, String eqid,String pid) {
+ baseMapper.updateCatalog(name, eqid,pid);
+ }
+
+ @Override
+ public void addCatalog(String name, String eqid,String pid) {
+ baseMapper.addCatalog(name, eqid,pid);
+ }
}
--
Gitblit v1.9.3