From 78e47ac599f2523d10eff320843a7c83a1ade688 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 27 Jul 2018 15:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A1=B9=E5=92=8C=E6=9D=A5=E5=87=BD?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml | 3 +++
 src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml    | 3 +++
 src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp          | 1 +
 src/main/webapp/WEB-INF/views/cfg/requestList.jsp              | 1 +
 4 files changed, 8 insertions(+)

diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index cbffe0705..6d9a86251 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -66,6 +66,9 @@
 		<if test="isValid != null">
 				AND r.is_valid=${isValid}
 		</if>
+		<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
 		<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
 				AND r.request_time between #{beginDate} and #{endDate}
 			</if>
diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
index 19a14b3ee..71df9a380 100644
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -55,6 +55,9 @@
     	<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
 		</if>
+		<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
  		<if test="taskName != null and taskName != ''">
 			AND r.task_name like 
 			<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index 3df098c95..1574e1c80 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -209,6 +209,7 @@
 											<c:when test="${taskInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
 											<c:when test="${taskInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
 											<c:when test="${taskInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${taskInfo.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
 									<td>${taskInfo.taskDesc }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 1dac7bbbe..6742d06e0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -228,6 +228,7 @@
 											<c:when test="${requestInfo.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
 											<c:when test="${requestInfo.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
 											<c:when test="${requestInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${requestInfo.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
 									<td>${requestInfo.requestTitle }</td>