diff --git a/src/main/java/com/github/yulichang/base/mapper/MPJDeepMapper.java b/src/main/java/com/github/yulichang/base/mapper/MPJDeepMapper.java index f29e6eb..919a568 100644 --- a/src/main/java/com/github/yulichang/base/mapper/MPJDeepMapper.java +++ b/src/main/java/com/github/yulichang/base/mapper/MPJDeepMapper.java @@ -26,7 +26,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param id 主键ID */ default T selectByIdDeep(Serializable id) { - return queryMapping(selectById(id), null); + return mpjQueryMapping(selectById(id), null); } /** @@ -38,7 +38,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default T selectByIdDeep(Serializable id, SFunction... property) { - return queryMapping(selectById(id), Arrays.asList(property)); + return mpjQueryMapping(selectById(id), Arrays.asList(property)); } /** @@ -51,7 +51,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default T selectByIdDeep(Serializable id, List> property) { - return queryMapping(selectById(id), property); + return mpjQueryMapping(selectById(id), property); } /** @@ -60,7 +60,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param idList 主键ID列表(不能为 null 以及 empty) */ default List selectBatchIdsDeep(Collection idList) { - return queryMapping(selectBatchIds(idList), null); + return mpjQueryMapping(selectBatchIds(idList), null); } /** @@ -72,7 +72,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default List selectBatchIdsDeep(Collection idList, SFunction... property) { - return queryMapping(selectBatchIds(idList), Arrays.asList(property)); + return mpjQueryMapping(selectBatchIds(idList), Arrays.asList(property)); } /** @@ -85,7 +85,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default List selectBatchIdsDeep(Collection idList, List> property) { - return queryMapping(selectBatchIds(idList), property); + return mpjQueryMapping(selectBatchIds(idList), property); } /** @@ -94,7 +94,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param columnMap 表字段 map 对象 */ default List selectByMapDeep(Map columnMap) { - return queryMapping(selectByMap(columnMap), null); + return mpjQueryMapping(selectByMap(columnMap), null); } /** @@ -106,7 +106,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default List selectByMapDeep(Map columnMap, SFunction... property) { - return queryMapping(selectByMap(columnMap), Arrays.asList(property)); + return mpjQueryMapping(selectByMap(columnMap), Arrays.asList(property)); } /** @@ -119,7 +119,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default List selectByMapDeep(Map columnMap, List> property) { - return queryMapping(selectByMap(columnMap), property); + return mpjQueryMapping(selectByMap(columnMap), property); } /** @@ -128,7 +128,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param queryWrapper 实体对象封装操作类(可以为 null) */ default T selectOneDeep(Wrapper queryWrapper) { - return queryMapping(selectOne(queryWrapper), null); + return mpjQueryMapping(selectOne(queryWrapper), null); } /** @@ -140,7 +140,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default T selectOneDeep(Wrapper queryWrapper, SFunction... property) { - return queryMapping(selectOne(queryWrapper), Arrays.asList(property)); + return mpjQueryMapping(selectOne(queryWrapper), Arrays.asList(property)); } /** @@ -153,7 +153,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default T selectOneDeep(Wrapper queryWrapper, List> property) { - return queryMapping(selectOne(queryWrapper), property); + return mpjQueryMapping(selectOne(queryWrapper), property); } /** @@ -162,7 +162,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param queryWrapper 实体对象封装操作类(可以为 null) */ default List selectListDeep(Wrapper queryWrapper) { - return queryMapping(selectList(queryWrapper), null); + return mpjQueryMapping(selectList(queryWrapper), null); } /** @@ -174,7 +174,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default List selectListDeep(Wrapper queryWrapper, SFunction... property) { - return queryMapping(selectList(queryWrapper), Arrays.asList(property)); + return mpjQueryMapping(selectList(queryWrapper), Arrays.asList(property)); } /** @@ -187,7 +187,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default List selectListDeep(Wrapper queryWrapper, List> property) { - return queryMapping(selectList(queryWrapper), property); + return mpjQueryMapping(selectList(queryWrapper), property); } /** @@ -196,7 +196,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param queryWrapper 实体对象封装操作类(可以为 null) */ default List> selectMapsDeep(Class clazz, Wrapper queryWrapper) { - return queryMapMapping(selectMaps(queryWrapper), clazz, null); + return mpjQueryMapMapping(selectMaps(queryWrapper), clazz, null); } /** @@ -209,7 +209,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default List> selectMapsDeep(Class clazz, Wrapper queryWrapper, SFunction... property) { - return queryMapMapping(selectMaps(queryWrapper), clazz, Arrays.asList(property)); + return mpjQueryMapMapping(selectMaps(queryWrapper), clazz, Arrays.asList(property)); } /** @@ -222,7 +222,7 @@ public interface MPJDeepMapper extends BaseMapper { * @param property 需要关联的字段 */ default List> selectMapsDeep(Class clazz, Wrapper queryWrapper, List> property) { - return queryMapMapping(selectMaps(queryWrapper), clazz, property); + return mpjQueryMapMapping(selectMaps(queryWrapper), clazz, property); } /** @@ -233,7 +233,7 @@ public interface MPJDeepMapper extends BaseMapper { */ default > E selectPageDeep(E page, Wrapper queryWrapper) { E e = selectPage(page, queryWrapper); - queryMapping(e.getRecords(), null); + mpjQueryMapping(e.getRecords(), null); return e; } @@ -248,7 +248,7 @@ public interface MPJDeepMapper extends BaseMapper { */ default > E selectPageDeep(E page, Wrapper queryWrapper, SFunction... property) { E e = selectPage(page, queryWrapper); - queryMapping(e.getRecords(), Arrays.asList(property)); + mpjQueryMapping(e.getRecords(), Arrays.asList(property)); return e; } @@ -264,7 +264,7 @@ public interface MPJDeepMapper extends BaseMapper { */ default > E selectPageDeep(E page, Wrapper queryWrapper, List> property) { E e = selectPage(page, queryWrapper); - queryMapping(e.getRecords(), property); + mpjQueryMapping(e.getRecords(), property); return e; } @@ -277,7 +277,7 @@ public interface MPJDeepMapper extends BaseMapper { */ default >> E selectMapsPageDeep(E page, Class clazz, Wrapper queryWrapper) { E e = selectMapsPage(page, queryWrapper); - queryMapMapping(e.getRecords(), clazz, null); + mpjQueryMapMapping(e.getRecords(), clazz, null); return e; } @@ -294,7 +294,7 @@ public interface MPJDeepMapper extends BaseMapper { default >> E selectMapsPageDeep(E page, Class clazz, Wrapper queryWrapper, SFunction... property) { E e = selectMapsPage(page, queryWrapper); - queryMapMapping(e.getRecords(), clazz, Arrays.asList(property)); + mpjQueryMapMapping(e.getRecords(), clazz, Arrays.asList(property)); return e; } @@ -312,7 +312,7 @@ public interface MPJDeepMapper extends BaseMapper { default >> E selectMapsPageDeep(E page, Class clazz, Wrapper queryWrapper, List> property) { E e = selectMapsPage(page, queryWrapper); - queryMapMapping(e.getRecords(), clazz, property); + mpjQueryMapMapping(e.getRecords(), clazz, property); return e; } @@ -324,7 +324,7 @@ public interface MPJDeepMapper extends BaseMapper { * * @param t 第一次查询结果 */ - default T queryMapping(T t, List> property) { + default T mpjQueryMapping(T t, List> property) { if (t == null) { return null; } @@ -337,9 +337,9 @@ public interface MPJDeepMapper extends BaseMapper { if (!hasProperty || list.contains(fieldInfo.getProperty())) { Object obj = fieldInfo.thisFieldGet(t); if (obj != null) { - List joinList = (List) fieldInfo.getJoinMapper().mappingWrapperConstructor( + List joinList = (List) fieldInfo.getJoinMapper().mpjMappingWrapperConstructor( fieldInfo.isFieldIsMap(), SqlKeyword.EQ, fieldInfo.getJoinColumn(), obj, fieldInfo); - bindData(t, fieldInfo, joinList); + mpjBindData(t, fieldInfo, joinList); fieldInfo.removeJoinField(joinList); } } @@ -356,7 +356,7 @@ public interface MPJDeepMapper extends BaseMapper { * * @param map 第一次查询结果 */ - default Map queryMapMapping(Map map, Class clazz, List> property) { + default Map mpjQueryMapMapping(Map map, Class clazz, List> property) { if (CollectionUtils.isEmpty(map)) { return map; } @@ -369,9 +369,9 @@ public interface MPJDeepMapper extends BaseMapper { if (!hasProperty || list.contains(fieldInfo.getProperty())) { Object obj = map.get(fieldInfo.getThisMapKey()); if (obj != null) { - List joinList = (List) fieldInfo.getJoinMapper().mappingWrapperConstructor( + List joinList = (List) fieldInfo.getJoinMapper().mpjMappingWrapperConstructor( fieldInfo.isFieldIsMap(), SqlKeyword.EQ, fieldInfo.getJoinColumn(), obj, fieldInfo); - bindMap(map, fieldInfo, joinList); + mpjBindMap(map, fieldInfo, joinList); fieldInfo.removeJoinField(joinList); } } @@ -388,7 +388,7 @@ public interface MPJDeepMapper extends BaseMapper { * * @param list 第一次查询结果 */ - default List queryMapping(List list, List> property) { + default List mpjQueryMapping(List list, List> property) { if (CollectionUtils.isEmpty(list)) { return list; } @@ -401,10 +401,10 @@ public interface MPJDeepMapper extends BaseMapper { if (!hasProperty || listProperty.contains(fieldInfo.getProperty())) { List itemList = list.stream().map(fieldInfo::thisFieldGet).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(itemList)) { - List joinList = (List) fieldInfo.getJoinMapper().mappingWrapperConstructor( + List joinList = (List) fieldInfo.getJoinMapper().mpjMappingWrapperConstructor( fieldInfo.isMappingEntity() && fieldInfo.isFieldIsMap(), SqlKeyword.IN, fieldInfo.getJoinColumn(), itemList, fieldInfo); - list.forEach(i -> bindData(i, fieldInfo, joinList)); + list.forEach(i -> mpjBindData(i, fieldInfo, joinList)); fieldInfo.removeJoinField(joinList); } else { list.forEach(i -> fieldInfo.fieldSet(i, new ArrayList<>())); @@ -423,7 +423,7 @@ public interface MPJDeepMapper extends BaseMapper { * * @param list 第一次查询结果 */ - default List> queryMapMapping(List> list, Class clazz, List> property) { + default List> mpjQueryMapMapping(List> list, Class clazz, List> property) { if (CollectionUtils.isEmpty(list)) { return list; } @@ -437,10 +437,10 @@ public interface MPJDeepMapper extends BaseMapper { List itemList = list.stream().map(m -> m.get(fieldInfo.getThisMapKey())) .collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(itemList)) { - List joinList = (List) fieldInfo.getJoinMapper().mappingWrapperConstructor( + List joinList = (List) fieldInfo.getJoinMapper().mpjMappingWrapperConstructor( fieldInfo.isMappingEntity() && fieldInfo.isFieldIsMap(), SqlKeyword.IN, fieldInfo.getJoinColumn(), itemList, fieldInfo); - list.forEach(i -> bindMap(i, fieldInfo, joinList)); + list.forEach(i -> mpjBindMap(i, fieldInfo, joinList)); fieldInfo.removeJoinField(joinList); } else { list.forEach(i -> i.put(fieldInfo.getField().getName(), new ArrayList<>())); @@ -454,7 +454,7 @@ public interface MPJDeepMapper extends BaseMapper { /** * 绑定数据 */ - default void bindData(T t, MPJTableFieldInfo fieldInfo, List joinList) { + default void mpjBindData(T t, MPJTableFieldInfo fieldInfo, List joinList) { if (fieldInfo.isMappingEntity()) { List list = joinList.stream().filter(j -> fieldInfo.joinFieldGet(j).equals(fieldInfo.thisFieldGet(t))) .collect(Collectors.toList()); @@ -469,7 +469,7 @@ public interface MPJDeepMapper extends BaseMapper { /** * 绑定数据 */ - default void bindMap(Map t, MPJTableFieldInfo fieldInfo, List joinList) { + default void mpjBindMap(Map t, MPJTableFieldInfo fieldInfo, List joinList) { List list = null; if (fieldInfo.isMappingEntity()) { if (fieldInfo.isFieldIsMap()) { @@ -493,8 +493,8 @@ public interface MPJDeepMapper extends BaseMapper { * 映射 wrapper 构造器 * 仅对使用映射注解时使用 */ - default Object mappingWrapperConstructor(boolean selectMap, SqlKeyword keyword, - String column, Object val, MPJTableFieldInfo fieldInfo) { + default Object mpjMappingWrapperConstructor(boolean selectMap, SqlKeyword keyword, + String column, Object val, MPJTableFieldInfo fieldInfo) { MPJMappingWrapper infoWrapper = fieldInfo.getWrapper(); MappingQuery wrapper = new MappingQuery<>(); if (infoWrapper.isHasCondition()) { diff --git a/src/main/java/com/github/yulichang/base/service/MPJDeepService.java b/src/main/java/com/github/yulichang/base/service/MPJDeepService.java index e2c2fd1..d8325f8 100644 --- a/src/main/java/com/github/yulichang/base/service/MPJDeepService.java +++ b/src/main/java/com/github/yulichang/base/service/MPJDeepService.java @@ -179,7 +179,7 @@ public interface MPJDeepService extends IService { * @param throwEx 有多个 result 是否抛出异常 */ default T getOneDeep(Wrapper queryWrapper, boolean throwEx) { - return ((MPJBaseMapper) getBaseMapper()).queryMapping(getOne(queryWrapper, throwEx), null); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(getOne(queryWrapper, throwEx), null); } /** @@ -192,7 +192,7 @@ public interface MPJDeepService extends IService { * @param property 需要关联的字段 */ default T getOneDeep(Wrapper queryWrapper, boolean throwEx, SFunction... property) { - return ((MPJBaseMapper) getBaseMapper()).queryMapping(getOne(queryWrapper, throwEx), Arrays.asList(property)); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(getOne(queryWrapper, throwEx), Arrays.asList(property)); } /** @@ -206,7 +206,7 @@ public interface MPJDeepService extends IService { * @param property 需要关联的字段 */ default T getOneDeep(Wrapper queryWrapper, boolean throwEx, List> property) { - return ((MPJBaseMapper) getBaseMapper()).queryMapping(getOne(queryWrapper, throwEx), property); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(getOne(queryWrapper, throwEx), property); } /** @@ -215,7 +215,7 @@ public interface MPJDeepService extends IService { * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} */ default Map getMapDeep(Wrapper queryWrapper) { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(getMap(queryWrapper), currentModelClass(), + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(getMap(queryWrapper), currentModelClass(), null); } @@ -228,7 +228,7 @@ public interface MPJDeepService extends IService { * @param property 需要关联的字段 */ default Map getMapDeep(Wrapper queryWrapper, SFunction... property) { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(getMap(queryWrapper), currentModelClass(), + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(getMap(queryWrapper), currentModelClass(), Arrays.asList(property)); } @@ -242,7 +242,7 @@ public interface MPJDeepService extends IService { * @param property 需要关联的字段 */ default Map getMapDeep(Wrapper queryWrapper, List> property) { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(getMap(queryWrapper), currentModelClass(), property); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(getMap(queryWrapper), currentModelClass(), property); } /** @@ -321,7 +321,7 @@ public interface MPJDeepService extends IService { */ default > E pageDeep(E page, Wrapper queryWrapper) { E e = page(page, queryWrapper); - ((MPJBaseMapper) getBaseMapper()).queryMapping(e.getRecords(), null); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(e.getRecords(), null); return e; } @@ -336,7 +336,7 @@ public interface MPJDeepService extends IService { */ default > E pageDeep(E page, Wrapper queryWrapper, SFunction... property) { E e = page(page, queryWrapper); - ((MPJBaseMapper) getBaseMapper()).queryMapping(e.getRecords(), Arrays.asList(property)); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(e.getRecords(), Arrays.asList(property)); return e; } @@ -352,7 +352,7 @@ public interface MPJDeepService extends IService { */ default > E pageDeep(E page, Wrapper queryWrapper, List> property) { E e = page(page, queryWrapper); - ((MPJBaseMapper) getBaseMapper()).queryMapping(e.getRecords(), property); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(e.getRecords(), property); return e; } @@ -364,7 +364,7 @@ public interface MPJDeepService extends IService { */ default > E pageDeep(E page) { E e = page(page); - ((MPJBaseMapper) getBaseMapper()).queryMapping(e.getRecords(), null); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(e.getRecords(), null); return e; } @@ -379,7 +379,7 @@ public interface MPJDeepService extends IService { */ default > E pageDeep(E page, SFunction... property) { E e = page(page); - ((MPJBaseMapper) getBaseMapper()).queryMapping(e.getRecords(), Arrays.asList(property)); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(e.getRecords(), Arrays.asList(property)); return e; } @@ -395,7 +395,7 @@ public interface MPJDeepService extends IService { */ default > E pageDeep(E page, List> property) { E e = page(page); - ((MPJBaseMapper) getBaseMapper()).queryMapping(e.getRecords(), property); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapping(e.getRecords(), property); return e; } @@ -405,7 +405,7 @@ public interface MPJDeepService extends IService { * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} */ default List> listMapsDeep(Wrapper queryWrapper) { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(listMaps(queryWrapper), currentModelClass(), null); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(listMaps(queryWrapper), currentModelClass(), null); } /** @@ -417,7 +417,7 @@ public interface MPJDeepService extends IService { * @param property 需要关联的字段 */ default List> listMapsDeep(Wrapper queryWrapper, SFunction... property) { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(listMaps(queryWrapper), currentModelClass(), + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(listMaps(queryWrapper), currentModelClass(), Arrays.asList(property)); } @@ -431,7 +431,7 @@ public interface MPJDeepService extends IService { * @param property 需要关联的字段 */ default List> listMapsDeep(Wrapper queryWrapper, List> property) { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(listMaps(queryWrapper), currentModelClass(), property); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(listMaps(queryWrapper), currentModelClass(), property); } /** @@ -440,7 +440,7 @@ public interface MPJDeepService extends IService { * @see Wrappers#emptyWrapper() */ default List> listMapsDeep() { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(listMaps(), currentModelClass(), null); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(listMaps(), currentModelClass(), null); } /** @@ -452,7 +452,7 @@ public interface MPJDeepService extends IService { * @see Wrappers#emptyWrapper() */ default List> listMapsDeep(SFunction... property) { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(listMaps(), currentModelClass(), Arrays.asList(property)); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(listMaps(), currentModelClass(), Arrays.asList(property)); } /** @@ -465,7 +465,7 @@ public interface MPJDeepService extends IService { * @see Wrappers#emptyWrapper() */ default List> listMapsDeep(List> property) { - return ((MPJBaseMapper) getBaseMapper()).queryMapMapping(listMaps(), currentModelClass(), property); + return ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(listMaps(), currentModelClass(), property); } /** @@ -476,7 +476,7 @@ public interface MPJDeepService extends IService { */ default >> E pageMapsDeep(E page, Wrapper queryWrapper) { E e = pageMaps(page, queryWrapper); - ((MPJBaseMapper) getBaseMapper()).queryMapMapping(e.getRecords(), currentModelClass(), null); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(e.getRecords(), currentModelClass(), null); return e; } @@ -491,7 +491,7 @@ public interface MPJDeepService extends IService { */ default >> E pageMapsDeep(E page, Wrapper queryWrapper, SFunction... property) { E e = pageMaps(page, queryWrapper); - ((MPJBaseMapper) getBaseMapper()).queryMapMapping(e.getRecords(), currentModelClass(), Arrays.asList(property)); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(e.getRecords(), currentModelClass(), Arrays.asList(property)); return e; } @@ -507,7 +507,7 @@ public interface MPJDeepService extends IService { */ default >> E pageMapsDeep(E page, Wrapper queryWrapper, List> property) { E e = pageMaps(page, queryWrapper); - ((MPJBaseMapper) getBaseMapper()).queryMapMapping(e.getRecords(), currentModelClass(), property); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(e.getRecords(), currentModelClass(), property); return e; } @@ -519,7 +519,7 @@ public interface MPJDeepService extends IService { */ default >> E pageMapsDeep(E page) { E e = pageMaps(page); - ((MPJBaseMapper) getBaseMapper()).queryMapMapping(e.getRecords(), currentModelClass(), null); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(e.getRecords(), currentModelClass(), null); return e; } @@ -534,7 +534,7 @@ public interface MPJDeepService extends IService { */ default >> E pageMapsDeep(E page, SFunction... property) { E e = pageMaps(page); - ((MPJBaseMapper) getBaseMapper()).queryMapMapping(e.getRecords(), currentModelClass(), Arrays.asList(property)); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(e.getRecords(), currentModelClass(), Arrays.asList(property)); return e; } @@ -550,7 +550,7 @@ public interface MPJDeepService extends IService { */ default >> E pageMapsDeep(E page, List> property) { E e = pageMaps(page); - ((MPJBaseMapper) getBaseMapper()).queryMapMapping(e.getRecords(), currentModelClass(), property); + ((MPJBaseMapper) getBaseMapper()).mpjQueryMapMapping(e.getRecords(), currentModelClass(), property); return e; } }