Jelajahi Sumber

fix: 修复操作日志导出错误

weijianghai 2 tahun lalu
induk
melakukan
f6df72376f

+ 2 - 1
src/main/java/com/nokia/dao/OperationLogDao.java

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Mapper
 public interface OperationLogDao extends BaseMapper<OperationLog> {
@@ -39,7 +40,7 @@ public interface OperationLogDao extends BaseMapper<OperationLog> {
             + " </where>"
             + " order by operation_time desc"
             + " </script>")
-    Page<ListOperationLogVo> listOperationLog(Page<ListOperationLogVo> page, @Param("operatorId") Integer operationId,
+    List<ListOperationLogVo> listOperationLog(Page<ListOperationLogVo> page, @Param("operatorId") Integer operationId,
                                               @Param("operatorAccount") String operatorAccount,
                                               @Param("operatorName") String operatorName,
                                               @Param("operationName") String operationName,

+ 4 - 4
src/main/java/com/nokia/service/LogService.java

@@ -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("没有查询到数据");
         }