From c0dee1ec1ecdfda654db0f52820e4bedc5c7f87d Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Thu, 8 Mar 2018 14:31:54 +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=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=97=B6=E9=98=B2=E6=AD=A2=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=202.=E7=B3=BB=E7=BB=9F=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8C=89serviceId=E5=8D=87=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/systemService/SystemServiceInfoDao.xml     | 1 +
 src/main/webapp/WEB-INF/views/systemService/form.jsp           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

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 5909e0dd9..6f8d640a1 100644
--- a/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml
@@ -53,6 +53,7 @@
 			<if test="serviceIdPre != null">
 				and service_id like concat(#{serviceIdPre}, '%')
 			</if>
+		order by ssi.service_id asc
 	</select>
 	
 	<select id="get" resultMap="systemServiceInfoMap">
diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp
index 6e2156f90..be301a63c 100644
--- a/src/main/webapp/WEB-INF/views/systemService/form.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp
@@ -60,6 +60,7 @@
 				if (flag) {
 					loading('LOADING...');
 					$("[disabled=disabled]").attr("disabled", false);
+					$("#submitBtn").attr("disabled", true);//防止重复提交
 					form.submit();
 				} else {
 					flag = true;
@@ -324,7 +325,7 @@
 							<div class="form-actions">
 								<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=<spring:message code="submit"></spring:message>></shiro:hasPermission>
+										<shiro:hasPermission name="system:service:edit"><input id="submitBtn" type="submit" class="btn btn-circle blue" value=<spring:message code="submit"></spring:message>></shiro:hasPermission>
 										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
 									</div>
 								</div>