Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -342,10 +342,10 @@
         	<if test="type != null and type != ''">
         		and
         		<if test="type == 'SERVICE'">
-        			spro.service_amount_ is not null
+        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0) 
         		</if>
         		<if test="type == 'SELL'">
-        			spro.sale_amount_ is not null
+        			(spro.sale_amount_ is not null and spro.sale_amount_ &gt; 0)
         		</if>
         	</if>
         </where>
@@ -371,10 +371,10 @@
         	<if test="type != null and type != ''">
         		and
         		<if test="type == 'SERVICE'">
-        			(spro.service_amount_ is not null or spro.service_amount_ = 0) 
+        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0) 
         		</if>
         		<if test="type == 'SELL'">
-        			(spro.sale_amount_ is not null or spro.sale_amount_ = 0)
+        			(spro.sale_amount_ is not null and spro.sale_amount_ &gt; 0)
         		</if>
         	</if>
         </where>