diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java index de201ba3..87dbc59e 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java @@ -45,6 +45,7 @@ public class SystemLogServerImpl implements ISystemLogServer { */ @Override public PageResult operate(PageParam pageParam, Map 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 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 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); } diff --git a/like-framework/like-admin/src/main/resources/application.yml b/like-framework/like-admin/src/main/resources/application.yml index c7c963be..59c98430 100644 --- a/like-framework/like-admin/src/main/resources/application.yml +++ b/like-framework/like-admin/src/main/resources/application.yml @@ -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: