From 92cd9131fa7d8929fa63bc01fb3054069af23062 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 10 Mar 2021 20:31:53 +0800
Subject: [PATCH] 客户管理完善

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/service/impl/CatalogServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 00d3e5c..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() {
-		return baseMapper.selectCatalogEqNUmber();
+	public List selectCatalogEqNUmber(String id) {
+		return baseMapper.selectCatalogEqNUmber(id);
 	}
 
 	@Override
@@ -72,7 +74,17 @@
 	}
 
 	@Override
-	public void updateCatalog(String name, String eqid) {
-		baseMapper.updateCatalog(name, eqid);
+	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