From ef23c4633ec83add4b5bcfef668f532da8a5fbb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 13 Mar 2023 11:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysPermissionContr?= =?UTF-8?q?oller=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysPermissionController.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index ae0cf5dc..68b19898 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -370,7 +370,7 @@ public class SysPermissionController { Result> result = new Result<>(); try { List list = sysRolePermissionService.list(new QueryWrapper().lambda().eq(SysRolePermission::getRoleId, roleId)); - result.setResult(list.stream().map(SysRolePermission -> String.valueOf(SysRolePermission.getPermissionId())).collect(Collectors.toList())); + result.setResult(list.stream().map(sysRolePermission -> String.valueOf(sysRolePermission.getPermissionId())).collect(Collectors.toList())); result.setSuccess(true); } catch (Exception e) { log.error(e.getMessage(), e); @@ -554,19 +554,11 @@ public class SysPermissionController { private JSONObject putMeta(SysPermission permission, JSONObject json) { JSONObject meta = new JSONObject(); // 由用户设置是否缓存页面 用布尔值 - if (permission.isKeepAlive()) { - meta.put("keepAlive", true); - } else { - meta.put("keepAlive", false); - } + meta.put("keepAlive", permission.isKeepAlive()); /*update_begin author:wuxianquan date:20190908 for:往菜单信息里添加外链菜单打开方式 */ //外链菜单打开方式 - if (permission.isInternalOrExternal()) { - meta.put("internalOrExternal", true); - } else { - meta.put("internalOrExternal", false); - } + meta.put("internalOrExternal", permission.isInternalOrExternal()); /* update_end author:wuxianquan date:20190908 for: 往菜单信息里添加外链菜单打开方式*/ meta.put("title", permission.getName()); @@ -632,10 +624,7 @@ public class SysPermissionController { * @return */ private boolean isWWWHttpUrl(String url) { - if (url != null && (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("{{"))) { - return true; - } - return false; + return url != null && (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("{{")); } /** @@ -755,7 +744,7 @@ public class SysPermissionController { Result> result = new Result<>(); try { List list = sysDepartPermissionService.list(new QueryWrapper().lambda().eq(SysDepartPermission::getDepartId, departId)); - result.setResult(list.stream().map(SysDepartPermission -> String.valueOf(SysDepartPermission.getPermissionId())).collect(Collectors.toList())); + result.setResult(list.stream().map(sysDepartPermission -> String.valueOf(sysDepartPermission.getPermissionId())).collect(Collectors.toList())); result.setSuccess(true); } catch (Exception e) { log.error(e.getMessage(), e);