From c302589567b7b556d8dfd7fca8cf3cf215d1a390 Mon Sep 17 00:00:00 2001 From: 钟日健 <5689795+arsn@user.noreply.gitee.com> Date: Wed, 24 Feb 2021 20:31:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java index 8343697..1e85d35 100644 --- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java +++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java @@ -18,6 +18,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springblade.jfpt.catalog.entitly.catalog; +import org.springblade.jfpt.catalog.vo.catalogVO; +import org.springblade.system.vo.DeptVO; import java.util.List; import java.util.Map; @@ -33,7 +35,9 @@ List<Map<String, Object>> selectCount(); List<Map<String, Object>> selectAddvcd(); List<Map<String, Object>> selectEq(); - List<Map<String, Object>> selectWar(); + List<Map<String, Object>> selectWar(String beginTime,String endTime); - List selectCatalogEqNUmber(String pid); + List<Map<String, Object>> selectCatalogEqNUmber(); + + List<catalogVO> lazyTree(String tenantId, Long parentId); } -- Gitblit v1.9.3