Merge branch 'Release-1.1' into develop

2018-08-07 17:31:59 +08:00
parent 04d4b3516c c02eb6fc3a
commit 24ff953eb5
4 changed files with 31 additions and 24 deletions
--- a/src/main/java/com/nis/web/dao/SwaggerLogDao.xml
+++ b/src/main/java/com/nis/web/dao/SwaggerLogDao.xml
@@ -41,6 +41,9 @@
 		<if test="exception != null and exception != ''">
 			AND a.exception_Info!=''
 		</if>
+		<if test="opAction != null and opAction != ''">
+			AND a.opAction=#{opAction}
+		</if>
 		ORDER BY a.request_time DESC
 	</select>