From 726dff6d0ccc29750e8f691a720d3a76d332dfd8 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Wed, 18 Jul 2018 19:31:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2service=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=AF=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/controller/BaseController.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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<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())) {
 			params.put("searchDIp", entry.getdIp());