From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +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 | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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 9e13d2f..c6a31a8 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
@@ -1,6 +1,7 @@
package com.ycl.controller.depart;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.BasePageDTO;
import com.ycl.api.BasePageVO;
@@ -11,6 +12,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;
@@ -18,7 +20,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.Arrays;
import java.util.List;
/**
@@ -63,15 +64,17 @@
}
/**
- * @Description batch deletion departments
- * @Param [ids]
* @return com.ycl.api.CommonResult<java.lang.Void>
+ * @Description batch deletion departments
+ * @Param [ids]
**/
- @ApiOperation("鍒犻櫎")
- @PostMapping(value = "/batch_deletion)")
- public CommonResult<Void> delete(@RequestParam String[] ids) {
- departService.removeBatchByIds(Arrays.asList(ids));
- return CommonResult.success(null);
+ @ApiOperation("鎵瑰鐞�-鍒犻櫎")
+ @PostMapping(value = "/batch_deletion")
+ public CommonResult delete(@RequestParam List<Long> ids) {
+ if (ids.isEmpty()) {
+ return CommonResult.failed("bad request parameter");
+ }
+ return CommonResult.success(departService.removeBatchByIds(ids));
}
@ApiOperation("璇︽儏")
@@ -97,16 +100,32 @@
@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);
}
@ApiOperation("鏌ヨ鎴戠殑閮ㄩ棬")
@GetMapping(value = "/belongDepart")
public CommonResult<BasePageDTO> belongDepart(BasePageVO params) {
- BasePageDTO basePageDTO= umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize());
+ BasePageDTO basePageDTO = umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize());
return CommonResult.success(basePageDTO);
}
-}
+ @ApiOperation("鏌ヨ椤剁骇閮ㄩ棬")
+ @GetMapping(value = "/query_father")
+ public CommonResult search() {
+ Integer fatherId = 0;
+ return CommonResult.success(departService
+ .list(new LambdaQueryWrapper<UmsDepart>()
+ .eq(UmsDepart::getParentId, fatherId)));
+ }
+
+ @ApiOperation("鏌ヨ閮ㄩ棬浜岀骇")
+ @GetMapping(value = "/query_father_children")
+ public CommonResult search(@RequestParam Integer fatherId) {
+ return CommonResult.success(departService
+ .list(new LambdaQueryWrapper<UmsDepart>()
+ .eq(UmsDepart::getParentId, fatherId)));
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0