From 58cff64fd964370d5c4fe6a5a7f6391d39f20af1 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Mon, 5 Mar 2018 10:23:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=B3=BB=E7=BB=9F=E4=B8=9A=E5=8A=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0serviceId=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=202.=E4=BF=AE=E5=A4=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=9A=E5=8A=A1=E6=97=B6serviceId=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96=E6=96=B0=E5=80=BC=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=88serviceId=E6=98=AF=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/systemService/SystemServiceInfoDao.xml | 3 +++
 src/main/webapp/WEB-INF/views/systemService/form.jsp       | 4 +++-
 src/main/webapp/WEB-INF/views/systemService/list.jsp       | 7 ++++++-
 3 files changed, 12 insertions(+), 2 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 fb0696c19..5909e0dd9 100644
--- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml
@@ -41,6 +41,9 @@
 			<if test="serviceName != null and serviceName != ''">
 				and ssi.service_name like CONCAT('%', #{serviceName}, '%')
 			</if>
+			<if test="serviceId != null and serviceId != ''">
+				and ssi.service_id like CONCAT('%', #{serviceId}, '%')
+			</if>
 			<if test="action != null">
 				and ssi.action=#{action}
 			</if>
diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp
index 3025fe689..80d767ed2 100644
--- a/src/main/webapp/WEB-INF/views/systemService/form.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp
@@ -116,6 +116,9 @@
 	
 	//自动获取serviceId
 	function autoServiceId() {
+		if ("${systemServiceInfo.id}") {
+			return false;
+		}
 		var type = $("[name=tableType]").val();
 		var action = $("#action").val();
 		var serviceIdPre;
@@ -315,7 +318,6 @@
 								<div class="row">
 									<div class="col-md-offset-3 col-md-9">
 										<shiro:hasPermission name="system:service:edit"><input type="submit" class="btn btn-circle blue" value="保存"/></shiro:hasPermission>
-										<%-- <shiro:hasPermission name="system:service:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission> --%>
 										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">取消</button>
 									</div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp
index e5f847025..0ea8ce84e 100644
--- a/src/main/webapp/WEB-INF/views/systemService/list.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp
@@ -79,10 +79,15 @@ function deleteService(id) {
 								</span>
 								
 								<span class="search-item">
-									<span>名称 :</span>
+									<span>业务名称 :</span>
 									<form:input path="serviceName" htmlEscape="false" class="input-small"/>
 								</span>
 								
+								<span class="search-item">
+									<span>业务ID :</span>
+									<form:input path="serviceId" htmlEscape="false" class="input-small"/>
+								</span>
+								
 								<span class="search-item">
 									<button type="submit" onclick="return page();" class="btn btn-default btn-sm">
 										<i class="fa fa-edit"></i> 搜索