From c8b01767292b3acaae1cc93618265f8d0e0dbf71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 16:09:24 +0800
Subject: [PATCH] 开发8-26加班人员管理对接权限结束
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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..db89721 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,8 +35,18 @@
@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) {
+ List<Map<String, Object>> departmentListTable = organizationalService.getDepartmentListTable(departmentId);
+ return Result.success(departmentListTable);
}
@ApiOperation(value = "娣诲姞閮ㄩ棬")
@@ -60,11 +71,8 @@
@ApiOperation(value = "鍒犻櫎閮ㄩ棬")
@DeleteMapping("/delete")
- public Result<?> deleteDepartment(Integer id) {
- Integer deleteDepartment = organizationalService.deleteDepartment(id);
- if (deleteDepartment >= 1){
- return Result.success("鍒犻櫎鎴愬姛锛�");
- }
- return Result.fail("鍒犻櫎澶辫触锛�");
+ public Result<?> deleteDepartment(String ids) {
+ organizationalService.deleteDepartment(ids);
+ return Result.success("鍒犻櫎鎴愬姛锛�");
}
}
--
Gitblit v1.9.3