From b7b0da18a6cd9775b5c5e2af4da91f15d6d3871e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 15 Sep 2022 15:27:10 +0800
Subject: [PATCH] 解决时间排序导致的分页重复
---
src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
index de81cee..f83df38 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
@@ -119,6 +119,16 @@
List<JurisdictionVO> tree = jurisdictionService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
return R.data(tree);
}
+ /**
+ * 懒加载获取部门树形结构（带队伍）
+ */
+ @GetMapping("/lazy-team")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+ public R<List<JurisdictionVO>> lazyTeam(String tenantId, Long parentId, BladeUser bladeUser) {
+ List<JurisdictionVO> tree = jurisdictionService.lazyTeam(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+ return R.data(tree);
+ }
/**
* 懒加载获取部门树形结构
@@ -182,7 +192,7 @@
}
}
- @PostMapping("/isOnArea")
+ @GetMapping("/isOnArea")
public R isOnArea(String jd, String wd) {
return R.data(jurisdictionService.isOnArea(jd, wd));
--
Gitblit v1.9.3