From bb32acfe7b46f4353007233755dd417fce7f952e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 12 三月 2024 11:57:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/AreasController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/AreasController.java b/server/company/src/main/java/com/doumee/api/business/AreasController.java
index 8fd44d6..0c96ba9 100644
--- a/server/company/src/main/java/com/doumee/api/business/AreasController.java
+++ b/server/company/src/main/java/com/doumee/api/business/AreasController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.Areas;
+import com.doumee.dao.business.vo.AreasTree;
import com.doumee.service.business.AreasService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -74,6 +75,21 @@
return ApiResponse.success(areasService.findPage(pageWrap));
}
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/findList")
+ public ApiResponse<List<Areas>> findList (@RequestBody Areas areas) {
+ return ApiResponse.success(areasService.findList(areas));
+ }
+
+ @ApiOperation("鍖哄煙鏍戝垪琛�")
+ @PostMapping("/findTreeList")
+ public ApiResponse<List<Areas>> findTreeList () {
+ List<Areas> areasList = areasService.findList(new Areas());
+ AreasTree treeBuild = new AreasTree(areasList);
+ areasList = treeBuild.buildTree();
+ return ApiResponse.success(areasList);
+ }
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:areas:exportExcel")
--
Gitblit v1.9.3