From d9a516f00f205095e23f9a402da13fb35621f139 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Thu, 23 Aug 2018 21:44:57 +0800
Subject: [PATCH] =?UTF-8?q?app=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/AppCfgDao.xml   | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 12a2cb593..eda6c05f5 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -533,6 +533,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
@@ -673,7 +676,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-			
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
@@ -795,7 +800,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-			
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
@@ -896,6 +903,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
@@ -994,6 +1004,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
@@ -1091,6 +1104,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
@@ -1188,6 +1204,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
@@ -1280,7 +1299,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-			
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
@@ -1381,7 +1402,9 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-			
+			<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
   			<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>