From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/business/CompanyDepartmentController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/CompanyDepartmentController.java b/server/shop/src/main/java/com/doumee/api/business/CompanyDepartmentController.java
index 35a4621..9b811e9 100644
--- a/server/shop/src/main/java/com/doumee/api/business/CompanyDepartmentController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/CompanyDepartmentController.java
@@ -6,9 +6,13 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
import com.doumee.service.business.CompanyDepartmentService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +42,14 @@
return ApiResponse.success(companyDepartmentService.create(companyDepartment));
}
+ @ApiOperation("缁勭粐鏍戞煡璇�")
+ @GetMapping("/tree")
+ @RequiresPermissions("business:companydepartment:query")
+ public ApiResponse<List<CompanyDepartment>> tree () {
+ return ApiResponse.success(companyDepartmentService.departTree(Constants.TWO));
+ }
+
+
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@RequiresPermissions("business:companydepartment:delete")
--
Gitblit v1.9.3