From 9bce971af02b08fdeb3752db050293e334d11160 Mon Sep 17 00:00:00 2001
From: caixiang <939387484@qq.com>
Date: Fri, 24 Mar 2023 11:54:31 +0800
Subject: [PATCH] commit

---
 .../java/com/cnbm/admin/controller/SysLogLoginController.java | 2 +-
 .../com/cnbm/admin/controller/SysLogOperationController.java  | 3 +--
 .../src/main/java/com/cnbm/admin/execl/SysLogLoginExcel.java  | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ym-admin/src/main/java/com/cnbm/admin/controller/SysLogLoginController.java b/ym-admin/src/main/java/com/cnbm/admin/controller/SysLogLoginController.java
index 882eca1..c00a144 100644
--- a/ym-admin/src/main/java/com/cnbm/admin/controller/SysLogLoginController.java
+++ b/ym-admin/src/main/java/com/cnbm/admin/controller/SysLogLoginController.java
@@ -61,7 +61,7 @@ public class SysLogLoginController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<SysLogLoginDTO> list = sysLogLoginService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, SysLogLoginExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "登入登出日志导出", list, SysLogLoginExcel.class);
     }
 
 }
diff --git a/ym-admin/src/main/java/com/cnbm/admin/controller/SysLogOperationController.java b/ym-admin/src/main/java/com/cnbm/admin/controller/SysLogOperationController.java
index f571fee..9d0bc8b 100644
--- a/ym-admin/src/main/java/com/cnbm/admin/controller/SysLogOperationController.java
+++ b/ym-admin/src/main/java/com/cnbm/admin/controller/SysLogOperationController.java
@@ -46,7 +46,6 @@ public class SysLogOperationController {
     })
     public Result<PageData<SysLogOperationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<SysLogOperationDTO> page = sysLogOperationService.page(params);
-
         return new Result<PageData<SysLogOperationDTO>>().ok(page);
     }
 
@@ -56,7 +55,7 @@ public class SysLogOperationController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<SysLogOperationDTO> list = sysLogOperationService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, SysLogOperationExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "操作日志导出", list, SysLogOperationExcel.class);
     }
 
 }
diff --git a/ym-admin/src/main/java/com/cnbm/admin/execl/SysLogLoginExcel.java b/ym-admin/src/main/java/com/cnbm/admin/execl/SysLogLoginExcel.java
index 8230aa2..4086bff 100644
--- a/ym-admin/src/main/java/com/cnbm/admin/execl/SysLogLoginExcel.java
+++ b/ym-admin/src/main/java/com/cnbm/admin/execl/SysLogLoginExcel.java
@@ -7,8 +7,8 @@ import java.util.Date;
 
 @Data
 public class SysLogLoginExcel {
-    @Excel(name = "用户操作")
-    private String operation;
+    @Excel(name = "用户操作", replace = {"登入_0", "登出_1"})
+    private Integer operation;
     @Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_1"})
     private Integer status;
     @Excel(name = "User-Agent")