From faaf296cbb86bcb2fb5e3de2541852d91e35e3c5 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期二, 30 四月 2024 14:45:09 +0800
Subject: [PATCH] 2024-04-30 将遗漏的两个接口加入,完善角色管理中接口权限

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 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..7e2c211 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,22 @@
 package com.yuanchu.mom.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
+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>
@@ -24,26 +33,31 @@
 public class DepartmentController {
 
     DepartmentService departmentService;
-
+    @ValueClassify("浜哄憳鏄庣粏")
     @ApiOperation(value = "娣诲姞閮ㄩ棬")
     @PostMapping("/addDepartment")
-    public Result addDepartment(@RequestBody Department department){
+    public Result addDepartment(@RequestBody Department department) {
         return Result.success(departmentService.addDepartment(department));
     }
-
+    @ValueAuth
     @ApiOperation(value = "鑾峰彇閮ㄩ棬鏍�")
     @GetMapping("/selectDepartment")
-    public Result selectDepartment(){
+    public Result selectDepartment() {
         return Result.success(departmentService.selectDepartment());
     }
-
+    @ValueClassify("浜哄憳鏄庣粏")
     @ApiOperation(value = "鍒犻櫎閮ㄩ棬")
     @PostMapping("/delDepartment")
-    public Result delDepartment(Integer id){
+    public Result delDepartment(Integer id) {
         return Result.success(departmentService.delDepartment(id));
     }
-
-
-
+    @ValueAuth
+    @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