From 0d4b7f7f064da3de6f34ac62f1c0cca6c13436bc Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Fri, 9 Feb 2018 17:38:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E9=85=8D=E7=BD=AE=E9=A1=B5=E6=90=9C=E7=B4=A2=E6=A0=8F?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/systemService/SystemServiceInfoDao.xml | 5 +----
 src/main/webapp/WEB-INF/views/systemService/list.jsp       | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml
index b7f19c0a2..b427a5c49 100644
--- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml
@@ -37,7 +37,7 @@
 		from system_service_info ssi
 		left join sys_user suc on suc.id=ssi.creator_id
 		left join sys_user sue on sue.id=ssi.editor_id
-		where 1=1
+		where ssi.is_valid=1
 			<if test="serviceName != null and serviceName != ''">
 				and ssi.service_name like CONCAT('%', #{serviceName}, '%')
 			</if>
@@ -47,9 +47,6 @@
 			<if test="serviceType != null">
 				and ssi.service_type=#{serviceType}
 			</if>
-			<if test="isValid != null">
-				and ssi.is_valid=#{isValid}
-			</if>
 	</select>
 	
 	<select id="get">
diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp
index d478cc382..7ae8714da 100644
--- a/src/main/webapp/WEB-INF/views/systemService/list.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp
@@ -39,7 +39,7 @@ function page(n,s){
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize }"/>
 						<div class="row" >
 							<div class="col-md-12">
-								动作:
+								<span>动作 :</span>
 								<form:select path="action">
 									<form:option value="">请选择</form:option>
 									<form:option value="1">阻断</form:option>
@@ -49,13 +49,14 @@ function page(n,s){
 									<form:option value="7">封堵监测白名单</form:option>
 									<form:option value="8">灰名单</form:option>
 								</form:select>
-								类型:
+								<span>类型 :</span>
 								<form:select path="serviceType">
 									<form:option value="">请选择</form:option>
 									<form:option value="1">单域</form:option>
 									<form:option value="2">多域</form:option>
 								</form:select>
-								名称:<form:input path="serviceName" htmlEscape="false" class="input-small"/>
+								<span>名称 :</span>
+								<form:input path="serviceName" htmlEscape="false" class="input-small"/>
 								<button type="submit" onclick="return page();" class="btn btn-default btn-sm">
 									<i class="fa fa-edit"></i> 搜索
 								</button>