From f7d9920917006ee51433f5020079e72c7acb061b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 26 八月 2023 17:00:10 +0800
Subject: [PATCH] 修改报告预览数据接口
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 591a8d9..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,13 +5,13 @@
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;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.utils.SpringUtil;
import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.Result;
import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import io.swagger.annotations.*;
@@ -25,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;
@@ -43,6 +44,9 @@
@Autowired
private UserService userService;
+
+ @Autowired
+ private RoleManagerService roleManagerService;
@ApiOperation("鐢ㄦ埛鐧诲綍")
@ApiImplicitParams(value = {
@@ -74,6 +78,13 @@
}else {
return Result.fail("鐧诲綍澶辫触");
}
+ }
+
+ @ApiOperation("鏂板鐢ㄦ埛鑾峰彇瑙掕壊鏉冮檺淇℃伅")
+ @GetMapping("/list")
+ public Result<?> getUserListRole(){
+ List<Map<String,Object>> data = roleManagerService.getUserListRole();
+ return Result.success(data);
}
@ApiOperation("鐧诲綍-->鑾峰彇鐢ㄦ埛淇℃伅")
@@ -137,7 +148,7 @@
@ApiImplicitParam(name = "status", value = "鍦ㄨ亴鐘舵��", dataTypeClass = Integer.class)
})
public Result<Map<String, Object>> getNewPersonnelPage(Integer pageNo, Integer pageSize, String name, Integer status) {
- IPage<PagePersonnelVo> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize), status);
+ IPage<Map<String, Object>> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize), status);
Map<String, Object> map = new HashMap<>();
map.put("row", PageList.getRecords());
map.put("total", PageList.getTotal());
--
Gitblit v1.9.3