diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java index 0de71409..3e486e16 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartRoleController.java @@ -203,7 +203,10 @@ public class SysDepartRoleController extends JeroController roleList = sysDepartRoleService.list(new QueryWrapper().eq("depart_id",departId)); List roleIds = roleList.stream().map(SysDepartRole::getId).collect(Collectors.toList()); //根据角色id,用户id查询已授权角色 - List roleUserList = departRoleUserService.list(new QueryWrapper().eq("user_id",userId).in("drole_id",roleIds)); + List roleUserList = null; + if(roleIds!=null && roleIds.size()>0){ + roleUserList = departRoleUserService.list(new QueryWrapper().eq("user_id",userId).in("drole_id",roleIds)); + } result.setSuccess(true); result.setResult(roleUserList); return result;