From d11d47ff31f8a66b51d3992dc4fcb1c25c1424bf Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Fri, 13 Sep 2024 13:44:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(Bug=E4=BF=AE=E5=A4=8D):=20=E6=B8=85?= =?UTF-8?q?=E7=90=86=E6=97=A0=E6=95=88=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/update/20240603110330_zone_add_role_menu.sql | 7 ------- .../20240627090118_zone_alert_cmd_doc_add_keywords.sql | 3 --- 2 files changed, 10 deletions(-) delete mode 100644 sql/update/20240603110330_zone_add_role_menu.sql delete mode 100644 sql/update/20240627090118_zone_alert_cmd_doc_add_keywords.sql diff --git a/sql/update/20240603110330_zone_add_role_menu.sql b/sql/update/20240603110330_zone_add_role_menu.sql deleted file mode 100644 index ca2985304..000000000 --- a/sql/update/20240603110330_zone_add_role_menu.sql +++ /dev/null @@ -1,7 +0,0 @@ --- 专区管理员增加修改组织权限 -SET FOREIGN_KEY_CHECKS = 0; - -INSERT INTO sys_role_menu (role_id, menu_id) -VALUES (5, 1019); - -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/sql/update/20240627090118_zone_alert_cmd_doc_add_keywords.sql b/sql/update/20240627090118_zone_alert_cmd_doc_add_keywords.sql deleted file mode 100644 index b61f67dbb..000000000 --- a/sql/update/20240627090118_zone_alert_cmd_doc_add_keywords.sql +++ /dev/null @@ -1,3 +0,0 @@ --- 专区文章表增加Keywords关键字 -alter table cms_doc - add keywords varchar(255) null comment '关键词'; \ No newline at end of file From c9d467d5b7851ba9ac1557b6106a99c2d01a5a8a Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Fri, 13 Sep 2024 13:48:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(Bug=E4=BF=AE=E5=A4=8D):=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E9=9C=80=E6=8E=92=E9=99=A4=E8=B6=85=E7=AE=A1=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java index 96d09a31b..b4c92bf12 100644 --- a/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java +++ b/microservices-modules/microservices-modules-system/src/main/java/com/microservices/system/controller/SysUserController.java @@ -239,16 +239,19 @@ public class SysUserController extends BaseController { */ @GetMapping("getInfo") public AjaxResult getInfo() { - SysUserDeptRole userIdentity = SecurityUtils.getUserIdentity(); - if (userIdentity == null) { - throw new ServiceException("当前组织不存在或无权限访问"); - } SysUser user = userService.selectUserById(SecurityUtils.getUserId()); + user.setPassword(null); // 角色集合 Set roles = tokenService.getRolePermissions(); // 权限集合 Set permissions = tokenService.getMenuPermissions(); + SysUserDeptRole userIdentity = SecurityUtils.getUserIdentity(); + + if (!roles.contains("admin") && userIdentity == null) { + throw new ServiceException("当前组织不存在或无权限访问"); + } + AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); ajax.put("gitlinkUrl", gitLinkUrl);