From e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期四, 24 八月 2023 10:53:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java index 2087a6a..83ea0de 100644 --- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java +++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java @@ -2,6 +2,7 @@ import com.yuanchu.limslaboratory.pojo.Organizational; import com.yuanchu.limslaboratory.service.OrganizationalService; +import com.yuanchu.limslaboratory.utils.MyUtil; import com.yuanchu.limslaboratory.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -34,10 +35,21 @@ @ApiOperation(value = "渚ц竟鏍忔爲灞曞紑") @GetMapping("/list") public Result<?> getFourLevelInformation() { - Map<String, Object> organizationalTree = organizationalService.OrganizationalTree(); + List<Map<String, Object>> organizationalTree = organizationalService.OrganizationalTree(); return Result.success(organizationalTree); } + @ApiOperation(value = "鏍规嵁鐐瑰嚮Id鏌ヨ閮ㄩ棬") + @ApiImplicitParams(value = { + @ApiImplicitParam(value = "閮ㄩ棬ID", name = "departmentId", dataTypeClass = Integer.class) + }) + @GetMapping("/table") + public Result<?> getDepartmentListTable(Integer departmentId) { + MyUtil.PrintLog(departmentId.toString()); + List<Map<String, Object>> departmentListTable = organizationalService.getDepartmentListTable(departmentId); + return Result.success(departmentListTable); + } + @ApiOperation(value = "娣诲姞閮ㄩ棬") @PostMapping("/add") public Result<?> addDepartment(@RequestBody @Validated Organizational organizational) { -- Gitblit v1.9.3