From ac865eafc7feb625b3946040cd86f937250b3cbd Mon Sep 17 00:00:00 2001 From: pan <380711010@qq.com> Date: Wed, 18 Sep 2024 09:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=95=E7=A4=BA=E4=B8=BA=E7=A9=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rzdata/web/controller/system/SysRoleController.java | 2 +- .../main/java/com/rzdata/framework/config/ResourcesConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/controller/system/SysRoleController.java b/tool-tech-admin/src/main/java/com/rzdata/web/controller/system/SysRoleController.java index 0890b65..57d12db 100644 --- a/tool-tech-admin/src/main/java/com/rzdata/web/controller/system/SysRoleController.java +++ b/tool-tech-admin/src/main/java/com/rzdata/web/controller/system/SysRoleController.java @@ -132,8 +132,8 @@ public class SysRoleController extends BaseController LoginUser loginUser = getLoginUser(); if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) { - loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser())); loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName())); + loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser())); tokenService.setLoginUser(loginUser); } return success(); diff --git a/tool-tech-framework/src/main/java/com/rzdata/framework/config/ResourcesConfig.java b/tool-tech-framework/src/main/java/com/rzdata/framework/config/ResourcesConfig.java index c1ba6ea..ab13d8b 100644 --- a/tool-tech-framework/src/main/java/com/rzdata/framework/config/ResourcesConfig.java +++ b/tool-tech-framework/src/main/java/com/rzdata/framework/config/ResourcesConfig.java @@ -36,7 +36,7 @@ public class ResourcesConfig implements WebMvcConfigurer /** swagger配置 */ registry.addResourceHandler("/swagger-ui/**") .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/") - .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());; + .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic()); } /**