From c8b01767292b3acaae1cc93618265f8d0e0dbf71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 16:09:24 +0800
Subject: [PATCH] 开发8-26加班人员管理对接权限结束
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index a01ef4c..7e21786 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.clients.UserLoginUtils;
import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.RoleManagerService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.shiro.realm.ShiroRealm;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -24,6 +25,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -42,6 +44,9 @@
@Autowired
private UserService userService;
+
+ @Autowired
+ private RoleManagerService roleManagerService;
@ApiOperation("鐢ㄦ埛鐧诲綍")
@ApiImplicitParams(value = {
@@ -75,6 +80,13 @@
}
}
+ @ApiOperation("鏂板鐢ㄦ埛鑾峰彇瑙掕壊鏉冮檺淇℃伅")
+ @GetMapping("/list")
+ public Result<?> getUserListRole(){
+ List<Map<String,Object>> data = roleManagerService.getUserListRole();
+ return Result.success(data);
+ }
+
@ApiOperation("鐧诲綍-->鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("/info")
public Result<?> getUserInfo(@RequestHeader("X-Token") String token){
--
Gitblit v1.9.3