diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java index 43e9cb42..dd959cbe 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java @@ -41,11 +41,11 @@ public class SysPermissionDataRuleImpl extends ServiceImpl getPermRuleListByPermId(String permissionId) { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysPermissionDataRule::getPermissionId, permissionId); query.orderByDesc(SysPermissionDataRule::getCreateTime); - List permRuleList = this.list(query); - return permRuleList; +// List permRuleList = this.list(query); + return this.list(query); } /** @@ -61,11 +61,11 @@ public class SysPermissionDataRuleImpl extends ServiceImpl queryPermissionDataRules(String username,String permissionId) { List idsList = this.baseMapper.queryDataRuleIds(username, permissionId); //update-begin--Author:scott Date:20191119 for:数据权限失效问题处理-------------------- - if(idsList==null || idsList.size()==0) { + if(idsList==null || idsList.isEmpty()) { return null; } //update-end--Author:scott Date:20191119 for:数据权限失效问题处理-------------------- - Set set = new HashSet(); + Set set = new HashSet<>(); for (String ids : idsList) { if(oConvertUtils.isEmpty(ids)) { continue; @@ -77,7 +77,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl().in("id", set).eq("status",CommonConstant.STATUS_1)); @@ -110,7 +110,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl