@@ -246,10 +246,12 @@
<if test="type != null and type != ''">
and sc.type = #{type}
</if>
- <choose>
+ <if test="supplierId != null and supplierId != ''">
- <when test="supplierId != null and supplierId != ''">and su.id = #{supplierId}</when>
+ and su.id = #{supplierId}
- <otherwise>and su.id is null and a.id is not null</otherwise>
+ </if>
- </choose>
+<!-- <if test="supplierId == null or supplierId = ''">-->
+<!-- and su.id is null-->
+<!-- </if>-->
<!-- <if test="year != null and year != ''">-->
<!-- and YEAR ( FROM_UNIXTIME( tbs.start_time / 1000 ))= #{year}-->
<!-- </if>-->