From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
index 5f202d2..c5ad7c2 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
/**
@@ -33,11 +34,7 @@
@ApiOperation("鏂板鐢ㄦ埛-->鑾峰彇鐢ㄦ埛鏉冮檺鍒楄〃")
@GetMapping("/list")
public Result<?> getUserRoleList(){
- //鏍规嵁token鑾峰彇鐢ㄦ埛淇℃伅
-// Map<String,Object> data = roleService.getUserRoleList();
-// if (data != null){
-// return Result.success(data);
-// }
- return Result.fail(202,"鐢ㄦ埛鐧诲綍淇℃伅鏃犳晥锛岃閲嶆柊鐧诲綍");
+ List<Map<String,Object>> data = roleService.getUserRoleList();
+ return Result.success(data);
}
}
--
Gitblit v1.9.3