From 761e112c66dea405f5f2d77af2b256b2688619cd 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:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysRoleController?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysRoleController.java  | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
index 0ae5637e..e53b24bb 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
@@ -77,7 +77,7 @@ public class SysRoleController {
 	@Autowired
 	private ISysPermissionService sysPermissionService;
 
-	private static String OPTION_SUCCESS = "操作成功!";
+	private static final String OPTION_SUCCESS = "操作成功!";
 
 	/**
 	  * 分页列表查询
@@ -223,19 +223,13 @@ public class SysRoleController {
 				role = sysRoleService.getById(id);
 			}
 			SysRole newRole = sysRoleService.getOne(new QueryWrapper<SysRole>().lambda().eq(SysRole::getRoleCode, roleCode));
-			if(newRole!=null) {
-				//如果根据传入的roleCode查询到信息了，那么就需要做校验了。
-				if(role==null) {
-					//role为空=>新增模式=>只要roleCode存在则返回false
-					result.setSuccess(false);
-					result.setMessage("角色编码已存在");
-					return result;
-				}else if(!id.equals(newRole.getId())) {
-					//否则=>编辑模式=>判断两者ID是否一致-
-					result.setSuccess(false);
-					result.setMessage("角色编码已存在");
-					return result;
-				}
+			//如果根据传入的roleCode查询到信息了，那么就需要做校验了。
+			if(newRole!=null && (role==null || !id.equals(newRole.getId()))) {
+				//role为空=>新增模式=>只要roleCode存在则返回false
+				//否则=>编辑模式=>判断两者ID是否一致-
+				result.setSuccess(false);
+				result.setMessage("角色编码已存在");
+				return result;
 			}
 		} catch (Exception e) {
 			result.setSuccess(false);