修复日志搜索bug
This commit is contained in:
parent
860dff2f92
commit
8a763d2ac6
|
|
@ -45,6 +45,7 @@ public class SystemLogServerImpl implements ISystemLogServer {
|
|||
*/
|
||||
@Override
|
||||
public PageResult<LogOperateVo> operate(PageParam pageParam, Map<String, String> params) {
|
||||
|
||||
Integer pageNo = pageParam.getPageNo();
|
||||
Integer pageSize = pageParam.getPageSize();
|
||||
|
||||
|
|
@ -54,21 +55,21 @@ public class SystemLogServerImpl implements ISystemLogServer {
|
|||
.leftJoin("ls_system_admin sa ON sa.id=t.admin_id")
|
||||
.orderByDesc("id");
|
||||
|
||||
IPage<LogOperateVo> iPage = logOperateMapper.selectJoinPage(
|
||||
new Page<>(pageNo, pageSize),
|
||||
LogOperateVo.class,
|
||||
mpjQueryWrapper);
|
||||
|
||||
logOperateMapper.setSearch(mpjQueryWrapper, params, new String[]{
|
||||
"like:title:str",
|
||||
"like:username:str",
|
||||
"=:type:int",
|
||||
"=:type:str",
|
||||
"=:status:int",
|
||||
"=:url:str",
|
||||
"=:ip:str",
|
||||
"datetime:startTime-endTime@create_time:str"
|
||||
});
|
||||
|
||||
IPage<LogOperateVo> iPage = logOperateMapper.selectJoinPage(
|
||||
new Page<>(pageNo, pageSize),
|
||||
LogOperateVo.class,
|
||||
mpjQueryWrapper);
|
||||
|
||||
for (LogOperateVo vo : iPage.getRecords()) {
|
||||
vo.setTaskTime(vo.getTaskTime());
|
||||
vo.setStartTime(TimeUtil.timestampToDate(vo.getStartTime()));
|
||||
|
|
@ -112,8 +113,6 @@ public class SystemLogServerImpl implements ISystemLogServer {
|
|||
voList.add(vo);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), voList);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ spring:
|
|||
mybatis-plus:
|
||||
mapper-locations: classpath*:/mapper/**Mapper.xml # 映射文件路径
|
||||
typeAliasesPackage: com.hxkj.**.mapper
|
||||
# configuration:
|
||||
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
configuration:
|
||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
global-config:
|
||||
banner: false
|
||||
db-config:
|
||||
|
|
|
|||
Loading…
Reference in New Issue