Merge branch 'dev'

1

themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -241,17 +241,17 @@
 		) t
 		<where>
 			<if
-				test="minMultipleFaceCount != null and minMultipleFaceCount != ''">
+				test="minMultipleFaceCount != null and minMultipleFaceCount != '' or minMultipleFaceCount == 0">
 				and t.multipleFaceCount &lt;= #{minMultipleFaceCount}
 			</if>
 			<if
-				test="maxMultipleFaceCount != null and maxMultipleFaceCount != ''">
+				test="maxMultipleFaceCount != null and maxMultipleFaceCount != '' or maxMultipleFaceCount == 0">
 				and t.multipleFaceCount &gt;= #{maxMultipleFaceCount}
 			</if>
-			<if test="minExceptionCount != null and minExceptionCount != ''">
+			<if test="minExceptionCount != null and minExceptionCount != '' or minExceptionCount == 0">
 				and t.exceptionCount &lt;= #{minExceptionCount}
 			</if>
-			<if test="maxExceptionCount != null and maxExceptionCount != ''">
+			<if test="maxExceptionCount != null and maxExceptionCount != '' or maxExceptionCount == 0">
 				and t.exceptionCount &gt;= #{maxExceptionCount}
 			</if>
 		</where>
@@ -308,7 +308,7 @@
 			<if test="roomCode != null and roomCode != ''">
 				and tees.room_code = #{roomCode}
 			</if>
-			<if test="approveStatus != null and approveStatus != ''">
+			<if test="approveStatus != null and approveStatus != '' or approveStatus == 0">
 				and tiiwi.approve_status = #{approveStatus}
 			</if>
 			<if test="name != null and name !=''">
@@ -338,17 +338,17 @@
 		) t
 		<where>
 			<if
-				test="minMultipleFaceCount != null and minMultipleFaceCount != ''">
+				test="minMultipleFaceCount != null and minMultipleFaceCount != '' or minMultipleFaceCount == 0">
 				and t.multipleFaceCount &lt;= #{minMultipleFaceCount}
 			</if>
 			<if
-				test="maxMultipleFaceCount != null and maxMultipleFaceCount != ''">
+				test="maxMultipleFaceCount != null and maxMultipleFaceCount != '' or maxMultipleFaceCount == 0">
 				and t.multipleFaceCount &gt;= #{maxMultipleFaceCount}
 			</if>
-			<if test="minExceptionCount != null and minExceptionCount != ''">
+			<if test="minExceptionCount != null and minExceptionCount != '' or minExceptionCount == 0">
 				and t.exceptionCount &lt;= #{minExceptionCount}
 			</if>
-			<if test="maxExceptionCount != null and maxExceptionCount != ''">
+			<if test="maxExceptionCount != null and maxExceptionCount != '' or maxExceptionCount == 0">
 				and t.exceptionCount &gt;= #{maxExceptionCount}
 			</if>
 		</where>