Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 433bc1e314ecfd483379ca0e2e74e7c815d3261f

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

@@ -38,6 +38,10 @@
    @Override
    public PageInfo<TErpIssueReportingVO> pageList(TErpIssueReportingQuery query) {
        PageInfo<TErpIssueReportingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(query.getReportStartTime()!=null && !query.getReportStartTime().isEmpty() && query.getReportEndTime()!=null && !query.getReportEndTime().isEmpty()){
            query.setReportStartTime(query.getReportStartTime()+" 00:00:00");
            query.setReportEndTime(query.getReportEndTime()+" 23:59:59");
        }
        List<TErpIssueReportingVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;