jiaosong
2023-11-06 4df44957a2a8985f5f812bc37ee409d2dc056855
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -116,7 +116,7 @@
        IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByDesc(Bikes::getSiteId,Bikes::getLockId);
        queryWrapper.orderByAsc(Bikes::getSiteId,Bikes::getLockId);
        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
                .leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
                .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
@@ -125,6 +125,7 @@
                .ne(Bikes::getLockId,collect.get(Constants.FORCE_BACK_LOCK).getCode())
                .ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
                .isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode)
                .eq(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode,"")
                .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode)
                .ne(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode,"");
        queryWrapper.selectAll(Bikes.class)