|
@@ -43,10 +43,11 @@ public class LogService {
|
|
|
|
|
|
public R<PageVo<ListOperationLogVo>> listOperationLog(ListOperationLogDto dto) {
|
|
|
PageVo<ListOperationLogVo> vo = new PageVo<>();
|
|
|
- Page<ListOperationLogVo> page = operationLogDao.listOperationLog(new Page<>(dto.getCurrent(), dto.getPageSize()),
|
|
|
+ Page<ListOperationLogVo> page = new Page<>(dto.getCurrent(), dto.getPageSize());
|
|
|
+ List<ListOperationLogVo> list = operationLogDao.listOperationLog(new Page<>(dto.getCurrent(), dto.getPageSize()),
|
|
|
dto.getOperatorId(), dto.getOperatorAccount(), dto.getOperatorName(), dto.getOperationName(),
|
|
|
dto.getStartTime(), dto.getEndTime());
|
|
|
- vo.setList(page.getRecords());
|
|
|
+ vo.setList(list);
|
|
|
vo.setTotal(page.getTotal());
|
|
|
return R.ok(vo);
|
|
|
}
|
|
@@ -58,10 +59,9 @@ public class LogService {
|
|
|
dto.setStartTime(LocalDateTime.now().with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN));
|
|
|
}
|
|
|
// 查询操作日志
|
|
|
- Page<ListOperationLogVo> page = operationLogDao.listOperationLog(null, dto.getOperatorId(),
|
|
|
+ List<ListOperationLogVo> list = operationLogDao.listOperationLog(null, dto.getOperatorId(),
|
|
|
dto.getOperatorAccount(), dto.getOperatorName(), dto.getOperationName(),
|
|
|
dto.getStartTime(), dto.getEndTime());
|
|
|
- List<ListOperationLogVo> list = page.getRecords();
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
return R.error("没有查询到数据");
|
|
|
}
|