From 593a94cbafdcc0ee08ece6fe12f601ddfa34effe Mon Sep 17 00:00:00 2001 From: aotemiao Date: Thu, 5 Mar 2026 16:03:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BF=AE=E6=AD=A3=20SysDictDataContr?= =?UTF-8?q?oller=20=E6=8E=A5=E5=8F=A3=E6=B3=A8=E9=87=8A=E5=8F=8A=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B3=A8=E8=A7=A3=E4=B8=AD=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/system/SysDictDataController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index 339f79c3a..f9b5448c2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -83,7 +83,7 @@ public class SysDictDataController extends BaseController { } /** - * 新增字典类型 + * 新增字典数据 */ @SaCheckPermission("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @@ -98,7 +98,7 @@ public class SysDictDataController extends BaseController { } /** - * 修改保存字典类型 + * 修改保存字典数据 */ @SaCheckPermission("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @@ -113,12 +113,12 @@ public class SysDictDataController extends BaseController { } /** - * 删除字典类型 + * 删除字典数据 * * @param dictCodes 字典code串 */ @SaCheckPermission("system:dict:remove") - @Log(title = "字典类型", businessType = BusinessType.DELETE) + @Log(title = "字典数据", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") public R remove(@PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(Arrays.asList(dictCodes)); From 50c36dc803134cf013c67412d60252ae5334de96 Mon Sep 17 00:00:00 2001 From: aotemiao Date: Fri, 6 Mar 2026 08:57:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=A7=92=E8=89=B2=E5=90=8E=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E6=97=A0=E8=A7=92=E8=89=B2=E5=88=86?= =?UTF-8?q?=E9=85=8D=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/system/service/impl/SysUserServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 9791ae3b9..bcdff9231 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -496,6 +496,11 @@ public class SysUserServiceImpl implements ISysUserService { roleList.remove(SystemConstants.SUPER_ADMIN_ID); } + // 移除超管角色后若无剩余角色，说明仅选了超管角色且不允许分配，显式报错 + if (roleList.isEmpty()) { + throw new ServiceException("不允许为普通用户分配超级管理员角色，请至少选择一个其他角色"); + } + // 校验是否有权限访问这些角色（含数据权限控制） if (roleMapper.selectRoleCount(roleList) != roleList.size()) { throw new ServiceException("没有权限访问角色的数据");