|
@@ -200,7 +200,8 @@ public class BasicRoleDataPermissionServiceImpl extends ServiceImpl<BasicRoleDat
|
|
|
queryWrapper.lambda().eq(BasicRoleDataPermission::getRoleId, roleId)
|
|
|
.eq(BasicRoleDataPermission::getPrivilegeId, privilegeId);
|
|
|
if (sysRole.getDefaultRole()) {
|
|
|
- queryWrapper.lambda().isNull(BasicRoleDataPermission::getSchoolId);
|
|
|
+ queryWrapper.lambda().and(t -> t.isNull(BasicRoleDataPermission::getSchoolId).or()
|
|
|
+ .eq(BasicRoleDataPermission::getSchoolId, schoolId));
|
|
|
} else {
|
|
|
queryWrapper.lambda().eq(BasicRoleDataPermission::getSchoolId, schoolId);
|
|
|
}
|