From 7cd87e30ed364aa6806eaa28939ea94ad1524a50 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 08 三月 2024 14:46:50 +0800
Subject: [PATCH] 部门增加管理员
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
index b2ad052..ded0bc5 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -6,7 +6,10 @@
import com.mindskip.xzs.domain.Department;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.UserDepartment;
+import com.mindskip.xzs.domain.vo.BaseSelect;
import com.mindskip.xzs.domain.vo.DepartmentVO;
+import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
+import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.repository.UserDepartmentMapper;
import com.mindskip.xzs.service.DepartmentService;
import com.mindskip.xzs.service.UserService;
@@ -30,6 +33,24 @@
private final UserService userService;
private final UserDepartmentMapper userDepartmentMapper;
+ /**
+ * 鑾峰彇閮ㄩ棬涓嬬敤鎴峰垪琛�(涓嬫媺)
+ * @param deptId
+ * @return
+ */
+ @GetMapping("/{id}/user-list")
+ public RestResponse<List<BaseSelect>> getDeptUserList(@PathVariable("id") Integer deptId) {
+ List<BaseSelect> data = departmentService.getDeptUserList(deptId);
+ return RestResponse.ok(data);
+ }
+
+
+ @PostMapping("/update-admin")
+ public RestResponse updateAdmin(@RequestBody UpdateDeptAdminVO form) {
+ departmentService.updateAdmin(form);
+ return RestResponse.ok();
+ }
+
@Autowired
public DepartmentController(DepartmentService departmentService, UserService userService, UserDepartmentMapper userDepartmentMapper) {
this.departmentService = departmentService;
@@ -46,12 +67,8 @@
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
public RestResponse<PageInfo<DepartmentResponseVM>> pageList(@RequestBody DepartmentResponseVM model) {
- PageInfo<Department> pageInfo = departmentService.gets(model);
- PageInfo<DepartmentResponseVM> page = PageInfoHelper.copyMap(pageInfo, q -> {
- DepartmentResponseVM vm = modelMapper.map(q,DepartmentResponseVM.class);
- return vm;
- });
- return RestResponse.ok(page);
+ PageInfo<DepartmentResponseVM> pageInfo = departmentService.gets(model);
+ return RestResponse.ok(pageInfo);
}
@RequestMapping(value = "/add", method = RequestMethod.POST)
--
Gitblit v1.8.0