From 32b324a0a098991afff3fa7c19699be650e5c517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=BB=B4=E4=BC=9F?= Date: Tue, 19 Sep 2023 15:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E9=87=8D?= =?UTF-8?q?=E5=90=8D=E6=96=87=E6=A1=88=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java | 2 +- .../java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java index a4f76b6f..b34d16d5 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java @@ -332,7 +332,7 @@ public class PermissionGroupImpl implements PermissionGroupService { Optional repeatName = groups.stream().filter(g -> !Objects.equals(g.getId(), saasPermissionGroup.getId()) && StringUtils.equalsIgnoreCase(saasPermissionGroup.getName(), g.getName())) .findFirst(); if (repeatName.isPresent()) { - throw new ServiceException("同角色，分组名称不能重复"); + throw new ServiceException("同角色，例外名称不能重复"); } } return saasPermissionGroup; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java index eb4c6c61..a49c291b 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java @@ -307,7 +307,7 @@ public class RoleServiceImpl implements RoleService { .filter(e -> Objects.nonNull(e) && !Objects.equals(e.getId(), saveOrUpdateRole.getId()) && StringUtils.equalsIgnoreCase(e.getName(), saasRole.getName())) .findFirst(); if (repeatNameRole.isPresent()) { - throw new ServiceException("同分组内不角色名称不能重复"); + throw new ServiceException("同分组内角色名称不能重复"); } }); }