From d87b7f135106cba0ce8a1c5ba40daec3415c33cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 8 Mar 2023 17:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysPermissionServi?=
 =?UTF-8?q?ceImpl=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysPermissionServiceImpl.java        | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java
index eef96d12..6775dcb8 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionServiceImpl.java
@@ -197,12 +197,9 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 				this.sysPermissionMapper.setMenuLeaf(pid, 0);
 				//b.判断老的菜单下是否还有其他子菜单，没有的话则设置为叶子节点
 				int cc = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, p.getParentId()));
-				if(cc==0) {
-					if(oConvertUtils.isNotEmpty(p.getParentId())) {
-						this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1);
-					}
+				if(cc == 0 && oConvertUtils.isNotEmpty(p.getParentId())) {
+					this.sysPermissionMapper.setMenuLeaf(p.getParentId(), 1);
 				}
-
 			}
 		}
 
@@ -238,11 +235,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 	@Override
 	public boolean hasPermission(String username, SysPermission sysPermission) {
 		int count = baseMapper.queryCountByUsername(username,sysPermission);
-		if(count>0){
-			return true;
-		}else{
-			return false;
-		}
+		return count > 0;
 	}
 
 	@Override
@@ -250,11 +243,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 		SysPermission sysPermission = new SysPermission();
 		sysPermission.setUrl(url);
 		int count = baseMapper.queryCountByUsername(username,sysPermission);
-		if(count>0){
-			return true;
-		}else{
-			return false;
-		}
+		return count > 0;
 	}
 
 }