From 834f4b42af823fc58c43ce99e330dbeb2b98df5d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 22 Nov 2021 09:18:10 +0800
Subject: [PATCH] 保安员查询接口调整,排序按id 倒序排序

---
 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index d5ab8c6..8763098 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -121,6 +121,10 @@
 						if (dept.getParentId().equals(1123598813738675201L)) {
 							return ForestNodeMerger.merge(baseMapper.lazyTreeCity(tenantId, parentId));
 						}
+						if (dept.getParentId().equals(0L)){
+							//南昌市公安局
+							return ForestNodeMerger.merge(baseMapper.lazyTreeByJurisdiction());
+						}
 					}
 				}
 			}else {
@@ -129,9 +133,8 @@
 			}
 		}
 		//admin
-		return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
+		return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId,null));
 	}
-
 	@Override
 	public List<DeptVO> lazyTrees() {
 		return  ForestNodeMerger.merge(baseMapper.lazyTrees());
@@ -324,6 +327,11 @@
 	}
 
 	@Override
+	public List<DeptVO> selectInfos() {
+		return baseMapper.selectInfos();
+	}
+
+	@Override
 	public List<DeptVo> selDeptList() {
 		return baseMapper.selDeptList();
 	}

--
Gitblit v1.9.3