10.28

Mr.Zhang

2023-10-28 805fcd4d881ac13d0fe9961076ead66a71c20b2d

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

@@ -88,7 +88,7 @@
    @Override
    public ActionLog findOne(ActionLog actionLog) {
        QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
        return actionLogMapper.selectOne(wrapper);
        return actionLogMapper.selectOne(wrapper.last(" limit 1"));
    }

    @Override
@@ -96,7 +96,7 @@
        QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
        return actionLogMapper.selectList(wrapper);
    }
  

    @Override
    public PageData<ActionLog> findPage(PageWrap<ActionLog> pageWrap) {

@@ -136,10 +136,11 @@
        queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
        queryWrapper.eq(pageWrap.getModel().getCreator()!=null, ActionLog::getCreator,pageWrap.getModel().getCreator());
        queryWrapper.in(pageWrap.getModel().getTypeList()!=null && pageWrap.getModel().getTypeList().size()>0, ActionLog::getType,pageWrap.getModel().getTypeList());
        queryWrapper.selectAs(ActionLog::getCreateDate,ActionLog::getCreateDate)
                .selectAs(ActionLog::getActInfo,ActionLog::getActInfo)
                .selectAs(ActionLog::getActReason,ActionLog::getActReason)
                .selectAs(SystemUser::getNickname,ActionLog::getCreator)
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent,"%"+pageWrap.getModel().getBikeCode()+"%");
        queryWrapper.eq(ActionLog::getObjType,Constants.ActionLogObjType.memberrides);
        queryWrapper
                .selectAll(ActionLog.class)
                .selectAs(SystemUser::getRealname,ActionLog::getCreatorName)
                .selectAs(Member::getOpenid,ActionLog::getOpenid)
                .selectAs(MemberRides::getBikeCode,ActionLog::getBikeCode)
                .selectAs(MemberRides::getRentSiteId,ActionLog::getRentSiteId)