Compare commits

..

No commits in common. "290c1508f17e9bd27a06b494b4b1f950826c99af" and "6549b3b57c176a3ce356e22e82ce6b5e32d3df79" have entirely different histories.

View File

@ -228,7 +228,7 @@ public class EbikeRegionServiceImpl extends ServiceImpl<EbikeRegionMapper, Ebike
@Override @Override
public Page<EbikeRegionDto> pageRegion(PageParam pageParam, Integer type,String simpleName,String regionName,Integer inOperation) { public Page<EbikeRegionDto> pageRegion(PageParam pageParam, Integer type,String simpleName,String regionName,Integer inOperation) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.select(EBIKE_REGION.ALL_COLUMNS,EBIKE_ADMINISTRATION_ZONE.NAME.as(EbikeRegionDto::getZoneName)) // .select(EBIKE_ADMINISTRATION_ZONE.NAME.as(EbikeRegionDto::getZoneName))
.leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_REGION.ZONE_ID)) .leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_REGION.ZONE_ID))
.where(EBIKE_REGION.TYPE.eq(type)) .where(EBIKE_REGION.TYPE.eq(type))
.where(EBIKE_REGION.SIMPLE_NAME.like(simpleName, Strings.isNotBlank(simpleName))) .where(EBIKE_REGION.SIMPLE_NAME.like(simpleName, Strings.isNotBlank(simpleName)))