修复日志查询service获取不对的问题
This commit is contained in:
@@ -592,7 +592,6 @@ public class BaseController {
|
|||||||
log.setAction(dict.getAction());
|
log.setAction(dict.getAction());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//初始化查询值判断
|
//初始化查询值判断
|
||||||
@@ -617,6 +616,15 @@ public class BaseController {
|
|||||||
}
|
}
|
||||||
if (entry.getService()!=null) {
|
if (entry.getService()!=null) {
|
||||||
params.put("searchService", entry.getService());
|
params.put("searchService", entry.getService());
|
||||||
|
} else if (entry.getAction()!=null) {
|
||||||
|
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
|
||||||
|
for (FunctionServiceDict dict : serviceList) {
|
||||||
|
if (dict.getAction().intValue() == entry.getAction().intValue()
|
||||||
|
&& dict.getFunctionId().intValue() == entry.getFunctionId().intValue()) {
|
||||||
|
entry.setService(dict.getServiceId());
|
||||||
|
params.put("searchService", dict.getServiceId());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(entry.getdIp())) {
|
if (StringUtils.isNotBlank(entry.getdIp())) {
|
||||||
params.put("searchDIp", entry.getdIp());
|
params.put("searchDIp", entry.getdIp());
|
||||||
|
|||||||
Reference in New Issue
Block a user