From b5a96d1184bb0c0d7c8ed9d4f96a0a3b7804e4be Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Wed, 29 Aug 2018 15:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AEaction?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/manipulation/DkBehaviorLogController.java    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
index ac925592e..5e1ca4dc4 100644
--- a/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
+++ b/src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
@@ -25,6 +25,7 @@ import com.nis.domain.maat.LogRecvData;
 import com.nis.util.CodeDicUtils;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.dao.dashboard.codedic.CodeResult;
@@ -47,26 +48,17 @@ public class DkBehaviorLogController extends BaseController{
 		try {
 			PageLog<DkBehaviorLog> page = new PageLog<DkBehaviorLog>(request, response);
 			Map<String, Object> params=new HashMap<>();
-			String searchService=null;
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
-			if(entry.getAction()!=null){
-				for(FunctionServiceDict service:serviceList){
-					if(service.getAction().intValue()==entry.getAction().intValue()){
-						searchService=service.getServiceId().toString();
-					}
-				}
-			}else{
+			if(StringUtil.isEmpty(entry.getAction())){
 				for(int i=0;i<serviceList.size();i++){
 					if(serviceList.get(i).getServiceId()!=32 && serviceList.get(i).getServiceId()!=128){
-						searchService = serviceList.get(i).getServiceId().toString();
 						entry.setAction(serviceList.get(i).getAction());
 						break;
 					}
 				}
 				
 			}
-			params.put("searchService", searchService);
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			//查询值判断