From 8f8ba3c62d6fc9f4733a408daf59a5badd82e5e2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:42:26 +0800
Subject: [PATCH] 开发8-25人员管理与组织架构对接完成
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 6980e9f..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;
@@ -38,6 +39,16 @@
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 = "娣诲姞閮ㄩ棬")
@PostMapping("/add")
public Result<?> addDepartment(@RequestBody @Validated Organizational organizational) {
@@ -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