diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 6287da339..0bb0c843a 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -592,7 +592,6 @@ public class BaseController { log.setAction(dict.getAction()); } } - } //初始化查询值判断 @@ -617,6 +616,15 @@ public class BaseController { } if (entry.getService()!=null) { params.put("searchService", entry.getService()); + } else if (entry.getAction()!=null) { + List 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())) { params.put("searchDIp", entry.getdIp());