From 6406ed1b6df65f8681344f206b8c4ef82829aba6 Mon Sep 17 00:00:00 2001
From: tianwenbo <tianwenbo@syxysoft.com>
Date: Tue, 7 Mar 2023 11:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20SysRolePermissi?=
 =?UTF-8?q?onServiceImpl.java=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysRolePermissionServiceImpl.java    | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRolePermissionServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRolePermissionServiceImpl.java
index 5e85be41..08a4f7b1 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRolePermissionServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysRolePermissionServiceImpl.java
@@ -1,23 +1,18 @@
 package com.jero.modules.system.service.impl;
 
-import java.util.*;
-
-import com.jero.common.constant.CacheConstant;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.util.IPUtils;
 import com.jero.common.util.SpringContextUtils;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysRolePermission;
 import com.jero.modules.system.mapper.SysRolePermissionMapper;
 import com.jero.modules.system.service.ISysRolePermissionService;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 /**
  * <p>
@@ -43,7 +38,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
 		}
 		LambdaQueryWrapper<SysRolePermission> query = new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId);
 		this.remove(query);
-		List<SysRolePermission> list = new ArrayList<SysRolePermission>();
+		List<SysRolePermission> list = new ArrayList<>();
         String[] arr = permissionIds.split(",");
 		for (String p : arr) {
 			if(oConvertUtils.isNotEmpty(p)) {
@@ -68,8 +63,8 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
 			ip = "127.0.0.1";
 		}
 		List<String> add = getDiff(lastPermissionIds,permissionIds);
-		if(add!=null && add.size()>0) {
-			List<SysRolePermission> list = new ArrayList<SysRolePermission>();
+		if(add!=null && !add.isEmpty()) {
+			List<SysRolePermission> list = new ArrayList<>();
 			for (String p : add) {
 				if(oConvertUtils.isNotEmpty(p)) {
 					SysRolePermission rolepms = new SysRolePermission(roleId, p);
@@ -80,15 +75,15 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
 			}
 			this.saveBatch(list);
 		}
-		
+
 		List<String> delete = getDiff(permissionIds,lastPermissionIds);
-		if(delete!=null && delete.size()>0) {
+		if(delete!=null && !delete.isEmpty()) {
 			for (String permissionId : delete) {
 				this.remove(new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId).eq(SysRolePermission::getPermissionId, permissionId));
 			}
 		}
 	}
-	
+
 	/**
 	 * 从diff中找出main中没有的元素
 	 * @param main
@@ -102,14 +97,14 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
 		if(oConvertUtils.isEmpty(main)) {
 			return Arrays.asList(diff.split(","));
 		}
-		
+
 		String[] mainArr = main.split(",");
 		String[] diffArr = diff.split(",");
 		Map<String, Integer> map = new HashMap<>();
 		for (String string : mainArr) {
 			map.put(string, 1);
 		}
-		List<String> res = new ArrayList<String>();
+		List<String> res = new ArrayList<>();
 		for (String key : diffArr) {
 			if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) {
 				res.add(key);