attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:dd7403ae0e141026c855d0a4ae2c417fb2054548
Branches Tags
attiya:main
..
compare: attiya:c914e5725c1601d3f71b8342d89b15fce8d65fde
Branches Tags
attiya:main

No commits in common. "dd7403ae0e141026c855d0a4ae2c417fb2054548" and "c914e5725c1601d3f71b8342d89b15fce8d65fde" have entirely different histories.
dd7403ae0e ... c914e5725c

1 changed files with 9 additions and 14 deletions
Show Stats Expand all files Collapse all files

11
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
View File

@ -215,14 +215,9 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
.where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE)) .where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE))
.where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId, StringUtil.hasText(zoneId))) .where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId, StringUtil.hasText(zoneId)))
.where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName))) .where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName)))
.where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionId, Objects.nonNull(operationRegionId))); .where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionId, Objects.nonNull(operationRegionId)))
if (borrowingSort != null) { .orderBy(EBIKE_SITE_REGION.BORROWING_ORDER,borrowingSort == 1)
queryWrapper.orderBy(EBIKE_SITE_REGION.BORROWING_ORDER, borrowingSort == 1); .orderBy(EBIKE_SITE_REGION.RETURN_ORDER,returnSort == 1);
}
if (returnSort != null) {
queryWrapper.orderBy(EBIKE_SITE_REGION.RETURN_ORDER, returnSort == 1);
}
return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, ResEbikeSiteRegionPageDto.class); return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, ResEbikeSiteRegionPageDto.class);
} }