修BUG

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -35,8 +35,10 @@ public class SysOperlogController extends BaseController {
      */
     @SaCheckPermission("monitor:operlog:list")
     @GetMapping("/list")
-    public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
-        return operLogService.selectPageOperLogList(operLog, pageQuery);
+    public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery,
+                                          @RequestParam(required = false) String beginTime,
+                                          @RequestParam(required = false) String endTime) {
+        return operLogService.selectPageOperLogList(operLog, pageQuery, beginTime, endTime);
     }
 
     /**
@@ -45,8 +47,10 @@ public class SysOperlogController extends BaseController {
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @SaCheckPermission("monitor:operlog:export")
     @PostMapping("/export")
-    public void export(SysOperLog operLog, HttpServletResponse response) {
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+    public void export(SysOperLog operLog, HttpServletResponse response,
+                       @RequestParam(required = false) String beginTime,
+                       @RequestParam(required = false) String endTime) {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog, beginTime, endTime);
         ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java

@@ -133,10 +133,4 @@ public class SysOperLog implements Serializable {
     @ExcelProperty(value = "操作时间")
     private Date operTime;
 
-    /**
-     * 请求参数
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
-
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface ISysOperLogService {
 
-    TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog, PageQuery pageQuery);
+    TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog, PageQuery pageQuery, String beginTime, String endTime);
 
     /**
      * 新增操作日志
@@ -28,7 +28,7 @@ public interface ISysOperLogService {
      * @param operLog 操作日志对象
      * @return 操作日志集合
      */
-    List<SysOperLog> selectOperLogList(SysOperLog operLog);
+    List<SysOperLog> selectOperLogList(SysOperLog operLog, String beginTime, String endTime);
 
     /**
      * 批量删除系统操作日志

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

@@ -48,8 +48,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
     }
 
     @Override
-    public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog, PageQuery pageQuery) {
-        Map<String, Object> params = operLog.getParams();
+    public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog, PageQuery pageQuery, String beginTime, String endTime) {
         LambdaQueryWrapper<SysOperLog> lqw = new LambdaQueryWrapper<SysOperLog>()
             .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
             .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
@@ -62,8 +61,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
             .eq(operLog.getStatus() != null,
                 SysOperLog::getStatus, operLog.getStatus())
             .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
-            .between(params.get("beginTime") != null && params.get("endTime") != null,
-                SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"));
+            .between(beginTime != null && endTime != null,
+                SysOperLog::getOperTime, beginTime, endTime);
         if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
             pageQuery.setOrderByColumn("oper_id");
             pageQuery.setIsAsc("desc");
@@ -90,8 +89,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
      * @return 操作日志集合
      */
     @Override
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
-        Map<String, Object> params = operLog.getParams();
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog, String beginTime, String endTime) {
         return baseMapper.selectList(new LambdaQueryWrapper<SysOperLog>()
             .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
             .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
@@ -104,8 +102,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
             .eq(operLog.getStatus() != null && operLog.getStatus() > 0,
                 SysOperLog::getStatus, operLog.getStatus())
             .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
-            .between(params.get("beginTime") != null && params.get("endTime") != null,
-                SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"))
+            .between(beginTime != null && endTime != null,
+                SysOperLog::getOperTime, beginTime, endTime)
             .orderByDesc(SysOperLog::getOperId));
     }