提交 c91ccb5a 编写于 作者: zlt2000's avatar zlt2000

修复bug搜索traceId报错

上级 c6b27c71
......@@ -29,7 +29,7 @@
<security-jwt.version>1.1.0.RELEASE</security-jwt.version>
<redisson-starter.version>3.16.1</redisson-starter.version>
<easyCaptcha.version>1.6.2</easyCaptcha.version>
<hutool.version>5.1.4</hutool.version>
<hutool.version>5.7.20</hutool.version>
<mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
<aliyun-sdk-oss>3.8.1</aliyun-sdk-oss>
<qiniu-java-sdk>7.2.28</qiniu-java-sdk>
......
......@@ -58,7 +58,12 @@ public class SysLogController {
public PageResult<TraceLog> traceLog(SearchDto searchDto) {
PageResult<JsonNode> pageResult = queryService.strQuery(SYS_LOG_INDEXNAME, searchDto);
List<JsonNode> jsonNodeList = pageResult.getData();
List<TraceLog> logList = traceLogService.transTraceLog(jsonNodeList);
List<TraceLog> logList;
if (jsonNodeList != null) {
logList = traceLogService.transTraceLog(jsonNodeList);
} else {
logList = new ArrayList<>(0);
}
return PageResult.<TraceLog>builder().data(logList).code(0).count((long) logList.size()).build();
}
}
......@@ -81,6 +81,10 @@
//显示表单弹窗
let showTraceLog = function (traceId) {
console.log(traceId)
traceId = traceId.replace('<mark>', '');
traceId = traceId.replace('</mark>', '');
console.log(traceId)
admin.putTempData('traceId', traceId);
admin.popupCenter({
title: '日志链路',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册