diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/io/github/linpeilie/BaseCycleAvoidingMapper.java b/ruoyi-common/ruoyi-common-core/src/main/java/io/github/linpeilie/BaseCycleAvoidingMapper.java index d18d67fd4..6db55bf18 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/io/github/linpeilie/BaseCycleAvoidingMapper.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/io/github/linpeilie/BaseCycleAvoidingMapper.java @@ -13,7 +13,7 @@ public interface BaseCycleAvoidingMapper extends BaseMapper { T convert(S source, @Context CycleAvoidingMappingContext context); default T convert(S source, @Context CycleAvoidingMappingContext context, Consumer beanConsumer) { - T bean = convert(source,context); + T bean = convert(source, context); if (Objects.nonNull(bean) && Objects.nonNull(beanConsumer)) { beanConsumer.accept(bean); } @@ -23,7 +23,7 @@ public interface BaseCycleAvoidingMapper extends BaseMapper { T convert(S source, @MappingTarget T target, @Context CycleAvoidingMappingContext context); default T convert(S source, @MappingTarget T target, @Context CycleAvoidingMappingContext context, Consumer beanConsumer) { - T bean = convert(source,target,context); + T bean = convert(source, target, context); if (Objects.nonNull(bean) && Objects.nonNull(beanConsumer)) { beanConsumer.accept(bean); } @@ -40,7 +40,7 @@ public interface BaseCycleAvoidingMapper extends BaseMapper { // 如果 beanConsumer 本来就为 null,则不再调用带 Consumer 参数的 convert 方法,避免在循环中进行不必要的非空判断 if (Objects.nonNull(beanConsumer)) { return sourceList.stream() - .map(source -> convert(source, beanConsumer)) + .map(source -> convert(source, context, beanConsumer)) .collect(Collectors.toList()); } return sourceList.stream() diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/io/github/linpeilie/BaseMapper.java b/ruoyi-common/ruoyi-common-core/src/main/java/io/github/linpeilie/BaseMapper.java index 3172bea71..5ab079661 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/io/github/linpeilie/BaseMapper.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/io/github/linpeilie/BaseMapper.java @@ -24,7 +24,7 @@ public interface BaseMapper { T convert(S source, @MappingTarget T target); default T convert(S source, @MappingTarget T target, Consumer beanConsumer) { - T bean = convert(source,target); + T bean = convert(source, target); if (Objects.nonNull(bean) && Objects.nonNull(beanConsumer)) { beanConsumer.accept(bean); }