Merge remote-tracking branch 'origin/master'

mitao

1 天以前 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationsServiceImpl.java

@@ -1,10 +1,15 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.OaApprovalApplicationsMapper;
import com.ruoyi.system.model.OaApprovalApplications;
import com.ruoyi.system.model.OaApprovalTodo;
import com.ruoyi.system.query.ApprovalTodoListQuery;
import com.ruoyi.system.service.OaApprovalApplicationsService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +22,11 @@
@Service
public class OaApprovalApplicationsServiceImpl extends ServiceImpl<OaApprovalApplicationsMapper, OaApprovalApplications> implements OaApprovalApplicationsService {

    @Override
    public PageInfo<OaApprovalApplications> pageListAudit(ApprovalTodoListQuery query) {
        PageInfo<OaApprovalApplications> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<OaApprovalApplications> list = this.baseMapper.pageListAudit(query,pageInfo);
        pageInfo.setRecords( list);
        return pageInfo;
    }
}