From afbc1b29cd2ce92484f1be1e533ee075dbe08ff2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 10 十月 2022 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index 568784a..0a7d69e 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -11,6 +11,7 @@
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.auth.UserAuthUtil;
import com.ycl.vo.depart.DepartVO;
+import com.ycl.vo.depart.UmsDepartVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,9 +70,11 @@
**/
@ApiOperation("鎵瑰鐞�-鍒犻櫎")
@PostMapping(value = "/batch_deletion")
- public CommonResult<Void> delete(@RequestParam Integer[] ids) {
- departService.removeBatchByIds(Arrays.asList(ids));
- return CommonResult.success(null);
+ public CommonResult delete(@RequestParam List<Long> ids) {
+ if (ids.isEmpty()){
+ return CommonResult.failed("bad request parameter");
+ }
+ return CommonResult.success(departService.removeBatchByIds(ids));
}
@ApiOperation("璇︽儏")
@@ -97,8 +100,8 @@
@ApiOperation("鏌ヨ鍏ㄩ儴閮ㄩ棬")
@GetMapping(value = "/page")
- public CommonResult<IPage<UmsDepart>> page(DepartVO.PageDepartVO params) {
- IPage<UmsDepart> page = departService.pageDepart(params);
+ public CommonResult<IPage<UmsDepartVO>> page(DepartVO.PageDepartVO params) {
+ IPage<UmsDepartVO> page = departService.pageDepart(params);
return CommonResult.success(page);
}
--
Gitblit v1.8.0