a

jiangping

2023-11-07 28a07b5b768096a2c75b55c440b8afd0b50b3f0b

 server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java

@@ -121,11 +121,13 @@
                .leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
                .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
                .like( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
                .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)
                .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,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)
                .selectAs(BaseParam::getName,Bikes::getParamName)
                .selectAs(Sites::getName,Bikes::getSiteName) ;