diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyDictRelationServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyDictRelationServiceImpl.java index dca6505..2c36b95 100644 --- a/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyDictRelationServiceImpl.java +++ b/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyDictRelationServiceImpl.java @@ -1,7 +1,6 @@ package com.thing.carbon.config.service.impl; -import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.thing.carbon.config.dto.CarbonEnergyDictRelationDTO; import com.thing.carbon.config.dto.CarbonEnergyVarietyDTO; @@ -176,11 +175,7 @@ public class CarbonEnergyDictRelationServiceImpl extends BaseServiceImpl handlePage(Map params) { - Page pages = mapper.paginate( - getPage(params), - buildOrderWrapper(params, null, false) - ); - PageData page = getPageData(pages, CarbonEnergyDictRelationDTO.class); + PageData page = getPageData(params, CarbonEnergyDictRelationDTO.class); List list = page.getList(); Set energyVarietyIdSet = list.stream().map(CarbonEnergyDictRelationDTO::getEnergyVarietyId).collect(Collectors.toSet());