From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期一, 24 十月 2022 18:12:41 +0800 Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构 --- ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java index 3cb4d0f..6df17ef 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java @@ -22,6 +22,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -112,7 +113,10 @@ @GetMapping("/menu/search_myself") public CommonResult searchMenusMyself() { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); - return CommonResult.success(umsMenuService.ListTreeMyself(user.getUserId())); + HashMap<String, Object> map = new HashMap<>(); + map.put("menu",umsMenuService.ListTreeMyself(user.getUserId())); + map.put("permission",umsMenuService.getPermission(user.getUserId())); + return CommonResult.success(map); } @ApiOperation("鑿滃崟鏉冮檺-涓汉鑿滃崟鐘舵�佷慨鏀�") -- Gitblit v1.8.0