From f400075d308c4c8bba74d828336dedecc2293af2 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 27 Feb 2018 15:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E5=87=BD=E5=A2=9E=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8A=9F=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8Cmessage.tag=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BF=BB=E9=A1=B5=E5=90=8E=E5=A4=A7?=
 =?UTF-8?q?=E6=AE=B5=E7=A9=BA=E7=99=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/RequestInfoController.java       | 14 +++++++++++---
 src/main/webapp/WEB-INF/tags/sys/message.tag       |  2 +-
 src/main/webapp/WEB-INF/views/cfg/requestForm.jsp  |  2 +-
 src/main/webapp/WEB-INF/views/cfg/requestList.jsp  |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
index 1aab4a8bd..a43656ba0 100644
--- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
+++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
@@ -12,6 +12,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.util.Constants;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.configuration.RequestInfoService;
@@ -58,18 +59,22 @@ public class RequestInfoController extends BaseController{
 		try {
 			if(requestInfo.getId()!=null){
 				// 保存用户信息
+				logger.info(requestInfo.getId()+"修改成功");
 				requestInfoService.saveOrUpdate(requestInfo);
 				addMessage(redirectAttributes, "success");
 			}else{
 				if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
+					logger.info(requestInfo.getRequestNumber()+"重复数据");
 					addMessage(model, "error");
 					return form(requestInfo, model);
 				}
 				// 保存用户信息
 				requestInfoService.saveOrUpdate(requestInfo);
 				addMessage(redirectAttributes, "success");
+				logger.info(requestInfo.getId()+"保存成功");
 			}
 		} catch (Exception e) {
+			logger.error(e.getMessage());
 			e.printStackTrace();
 			addMessage(model, "error");
 		}
@@ -95,8 +100,9 @@ public class RequestInfoController extends BaseController{
      * @return
      */
 	@RequestMapping(value = "requestExamine")
-    public String requestExamine(RequestInfo requestInfo, Model model){
+    public String requestExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
     	requestInfoService.requestExamine(requestInfo);
+    	addMessage(redirectAttributes, "success");
     	return "redirect:" + adminPath + "/cfg/request/list?repage";
     	
     }
@@ -107,8 +113,9 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "requestCancelExamine")
-	public String requestCancelExamine(RequestInfo requestInfo, Model model){
+	public String requestCancelExamine(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
 		requestInfoService.requestCancelExamine(requestInfo);
+		addMessage(redirectAttributes, "success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
 	}
@@ -119,8 +126,9 @@ public class RequestInfoController extends BaseController{
 	 * @return
 	 */
 	@RequestMapping(value = "delete")
-	public String delete(RequestInfo requestInfo, Model model){
+	public String delete(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
 		requestInfoService.delete(requestInfo);
+		addMessage(redirectAttributes, "success");
 		return "redirect:" + adminPath + "/cfg/request/list?repage";
 		
 	}
diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag
index bd46fd1e0..29af115b5 100644
--- a/src/main/webapp/WEB-INF/tags/sys/message.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/message.tag
@@ -6,5 +6,5 @@
 <c:if test="${not empty content}">
 	<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${fn:indexOf(content,'失败') eq -1?'success':'error'}"/></c:if>
 	<div id="messageBox" class="alert alert-${ctype}"><button data-dismiss="alert" class="close">×</button>${content}</div> 
-	<script type="text/javascript">/* if(!top.$.jBox.tip.mess) */{top.$.jBox.tip.mess=1;top.$.jBox.tip("${content}","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();} </script>
+	<script type="text/javascript">if(!top.$.jBox.tip.mess) {top.$.jBox.tip.mess=1;top.$.jBox.tip("${content}","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();}</script>
 </c:if>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
index 0be62863e..918e282d0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
@@ -7,7 +7,7 @@
 </head>
 <body>
 
-<div class="page-content">
+<div class="content">
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index b6d49cf94..06f66dffb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -8,7 +8,7 @@
 
 <body>
 
-<div class="page-content">
+<div class="content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"