From c09344cd536257fe7d71435840508f11d8269242 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 24 七月 2024 15:06:00 +0800
Subject: [PATCH] feat：选人增加姓名条件
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 d924abd..b8eb2a4 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -1,6 +1,5 @@
package com.mindskip.xzs.controller.admin;
-import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.domain.Department;
@@ -68,8 +67,8 @@
}
@RequestMapping(value = "/add", method = RequestMethod.POST)
- public RestResponse add(@RequestBody @Valid String name) {
- return RestResponse.ok(departmentService.add(name));
+ public RestResponse add(@RequestBody @Valid Department model) {
+ return RestResponse.ok(departmentService.add(model));
}
@RequestMapping(value = "/update", method = RequestMethod.POST)
@@ -79,7 +78,7 @@
@RequestMapping(value = "/get/{id}", method = RequestMethod.POST)
public RestResponse update(@PathVariable Integer id) {
- return RestResponse.ok(departmentService.getById(id));
+ return RestResponse.ok(departmentService.getByIdVO(id));
}
@RequestMapping(value = "/getUserByDepartment/{id}", method = RequestMethod.POST)
@@ -147,7 +146,7 @@
@RequestMapping(value = "/getDeptAdmins", method = RequestMethod.GET)
public RestResponse<List<Department>> getDeptAdmins(){
- return RestResponse.ok(userService.getDeptAdmins(isDeptAdmin() ? getCurrentUser().getId() : null));
+ return RestResponse.ok(userService.getDeptAdmins(isDeptAdmin() ? getAdminDeptIds() : null));
}
@GetMapping("/cascader")
@@ -155,4 +154,9 @@
return RestResponse.ok(departmentService.cascader());
}
+ @GetMapping("/getCurrentDeptId")
+ public RestResponse<List<Integer>> getCurrentDeptIds(){
+ return RestResponse.ok(getAdminDeptIds());
+ }
+
}
--
Gitblit v1.8.0