From 7722aa86f1a0e2aacbf2fd17203789619e1c64e3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 21 Feb 2022 19:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
index 0a98edd..4c6b33f 100644
--- a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
+++ b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java
@@ -16,9 +16,11 @@
  */
 package org.springblade.modules.catalog.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springblade.modules.catalog.entitly.catalog;
 import org.springblade.modules.catalog.vo.catalogVO;
+import org.springblade.modules.system.vo.DeptVO;
 
 import java.util.List;
 import java.util.Map;
@@ -48,5 +50,6 @@
 	 * 获取行政区--》客户--》部门机构 --》安保人员 树形数据
 	 * @return
 	 */
-	List<catalogVO> getBigTree();
+	@SqlParser(filter=true)
+	List<DeptVO> getBigTree();
 }

--
Gitblit v1.9.3