From d86a37f36ec375f8aa3d3eaee18ea1ad323eba0b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 四月 2024 09:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
index 6925d5e..444c062 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
@@ -1,13 +1,20 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.UserDto;
+import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.Department;
+import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.DepartmentService;
+import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+
+import java.util.Map;
/**
* <p>
@@ -25,25 +32,31 @@
DepartmentService departmentService;
- @ApiOperation(value = "娣诲姞閮ㄩ棬")
+ @ApiOperation(value = "浜哄憳鏄庣粏-娣诲姞閮ㄩ棬")
@PostMapping("/addDepartment")
- public Result addDepartment(@RequestBody Department department){
+ public Result addDepartment(@RequestBody Department department) {
return Result.success(departmentService.addDepartment(department));
}
- @ApiOperation(value = "鑾峰彇閮ㄩ棬鏍�")
+ @ApiOperation(value = "浜哄憳鏄庣粏-鑾峰彇閮ㄩ棬鏍�")
@GetMapping("/selectDepartment")
- public Result selectDepartment(){
+ public Result selectDepartment() {
return Result.success(departmentService.selectDepartment());
}
- @ApiOperation(value = "鍒犻櫎閮ㄩ棬")
+ @ApiOperation(value = "浜哄憳鏄庣粏-鍒犻櫎閮ㄩ棬")
@PostMapping("/delDepartment")
- public Result delDepartment(Integer id){
+ public Result delDepartment(Integer id) {
return Result.success(departmentService.delDepartment(id));
}
-
+ @ApiOperation(value = "浜哄憳鏄庣粏-鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�")
+ @PostMapping("/showUserById")
+ public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserDto.class);
+ return Result.success(departmentService.showUserById(page, user));
+ }
}
--
Gitblit v1.9.3