diff --git a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysLogController.java b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysLogController.java index e764aa764eaf586685d502e20145f6e437c0733c..667e1d0adefb0af356ba065a99e7e21ad42ab702 100644 --- a/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysLogController.java +++ b/smart-health-modules/cloud-upms/cloud-upms-biz/src/main/java/cn/sh/stc/sict/cloud/upms/controller/web/SysLogController.java @@ -1,7 +1,9 @@ package cn.sh.stc.sict.cloud.upms.controller.web; +import cn.hutool.core.util.StrUtil; import cn.sh.stc.sict.cloud.upms.model.SysLog; import cn.sh.stc.sict.cloud.upms.service.SysLogService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import cn.sh.stc.sict.cloud.common.core.util.R; @@ -29,24 +31,31 @@ public class SysLogController { /** * 分页查询 - * @param page 分页对象 + * + * @param page 分页对象 * @param sysLog 系统日志 * @return */ @ApiOperation("分页查询 系统日志") @GetMapping("/page") public R getSysLogPage(Page page, SysLog sysLog) { - return new R<>(sysLogService.page(page,Wrappers.query(sysLog))); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(sysLog.getTitle()), SysLog::getTitle, sysLog.getTitle()) + .like(StrUtil.isNotBlank(sysLog.getMethod()), SysLog::getMethod, sysLog.getMethod()) + .like(StrUtil.isNotBlank(sysLog.getParams()), SysLog::getParams, sysLog.getParams()) + .orderByDesc(SysLog::getCreateTime); + return new R<>(sysLogService.page(page, wrapper)); } /** * 通过id查询系统日志 + * * @param id id * @return R */ @ApiOperation("通过id查询 系统日志") @GetMapping("/{id}") - public R getById(@PathVariable("id") Long id){ + public R getById(@PathVariable("id") Long id) { return new R<>(sysLogService.getById(id)); }