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 dd959cbe..a37e2ed4 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 @@ -1,5 +1,6 @@ package com.jero.modules.system.service.impl; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -62,7 +63,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl idsList = this.baseMapper.queryDataRuleIds(username, permissionId); //update-begin--Author:scott Date:20191119 for:数据权限失效问题处理-------------------- if(idsList==null || idsList.isEmpty()) { - return null; + return Collections.emptyList(); } //update-end--Author:scott Date:20191119 for:数据权限失效问题处理-------------------- Set set = new HashSet<>(); @@ -78,7 +79,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl().in("id", set).eq("status",CommonConstant.STATUS_1)); }