From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 13:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 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 6980e9f..02663d2 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
@@ -1,7 +1,9 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
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;
@@ -33,13 +35,26 @@
@ApiOperation(value = "渚ц竟鏍忔爲灞曞紑")
@GetMapping("/list")
+ @AuthHandler
public Result<?> getFourLevelInformation() {
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")
+ @AuthHandler
+ public Result<?> getDepartmentListTable(Integer departmentId) {
+ List<Map<String, Object>> departmentListTable = organizationalService.getDepartmentListTable(departmentId);
+ return Result.success(departmentListTable);
+ }
+
@ApiOperation(value = "娣诲姞閮ㄩ棬")
@PostMapping("/add")
+ @AuthHandler
public Result<?> addDepartment(@RequestBody @Validated Organizational organizational) {
Integer addDepartment = organizationalService.addDepartment(organizational);
if (addDepartment >= 1){
@@ -49,7 +64,8 @@
}
@ApiOperation(value = "淇敼閮ㄩ棬")
- @PutMapping("/add")
+ @PutMapping("/update")
+ @AuthHandler
public Result<?> updateDepartment(Integer id, @RequestBody @Validated Organizational organizational) {
Integer addDepartment = organizationalService.updateDepartment(id, organizational);
if (addDepartment >= 1){
@@ -60,11 +76,9 @@
@ApiOperation(value = "鍒犻櫎閮ㄩ棬")
@DeleteMapping("/delete")
- public Result<?> deleteDepartment(Integer id) {
- Integer deleteDepartment = organizationalService.deleteDepartment(id);
- if (deleteDepartment >= 1){
- return Result.success("鍒犻櫎鎴愬姛锛�");
- }
- return Result.fail("鍒犻櫎澶辫触锛�");
+ @AuthHandler
+ public Result<?> deleteDepartment(String ids) {
+ organizationalService.deleteDepartment(ids);
+ return Result.success("鍒犻櫎鎴愬姛锛�");
}
}
--
Gitblit v1.9.3