From d52ece745ebe19f97d24d807d64e9a7a601b77ce Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 22 一月 2022 15:00:58 +0800
Subject: [PATCH] !132 优化查询是否存在的方法,替换魔法值为已定义的常量 * fix 替换查询所有子部门数中魔法值为已定义的常量 * fix 1.修改查询是否存在的方法改为baseMapper.exists()方法查询。 2.将部分魔法值改为已定义的常量

---
 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