From cd510b43b1ef85202ddf9018271aaadf695f3c8d Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: 星期二, 25 一月 2022 17:17:06 +0800
Subject: [PATCH] fix 优化登录、注册校验方式，在接口通过@Validated进行数据基础校验，以及服务执行到异常后，抛出异常结束方法执行（减少if-else嵌套）。
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 8b61b2d..81b8d66 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -136,11 +136,10 @@
*/
@Override
public String checkRoleNameUnique(SysRole role) {
- Long roleId = ObjectUtil.isNull(role.getRoleId()) ? -1L : role.getRoleId();
- boolean count = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
.eq(SysRole::getRoleName, role.getRoleName())
- .ne(SysRole::getRoleId, roleId));
- if (count) {
+ .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -154,11 +153,10 @@
*/
@Override
public String checkRoleKeyUnique(SysRole role) {
- Long roleId = ObjectUtil.isNull(role.getRoleId()) ? -1L : role.getRoleId();
- boolean count = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
.eq(SysRole::getRoleKey, role.getRoleKey())
- .ne(SysRole::getRoleId, roleId));
- if (count) {
+ .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
--
Gitblit v1.9.3