分销系统V.1.0.0

src/main/resources/mapper/CmReportingMemberMapper.xml

@@ -145,9 +145,9 @@
 			<if test="cmDistribution.addTime != null "> and cm_distribution.addTime = #{cmDistribution.addTime}</if>
 			<if test="clubName != null and clubName != ''"> and cm_reporting_club.clubName like concat('%', #{clubName}, '%')</if>
 			<if test="settleStatus != null"> and cm_reporting_member.settleStatus = #{settleStatus}</if>
-			<if test="splitSettleStatus != null"> and cm_reporting_club.splitSettleStatus = #{splitSettleStatus}</if>
+			<if test="splitSettleStatus != null "> and cm_reporting_club.splitSettleStatus = #{splitSettleStatus}</if>
 			<if test="payWay != null"> and cdr.payWay = #{payWay}</if>
-			<if test="shopOrderNo != null"> and cso.shopOrderNo = #{shopOrderNo}</if>
+			<if test="shopOrderNo != null and shopOrderNo != '' "> and cso.shopOrderNo = #{shopOrderNo}</if>
 			<if test="startTime != null and startTime != ''"> and cso.orderTime > #{startTime}</if>
 			<if test="endTime != null and endTime != ''"> and cso.orderTime &lt; #{endTime}</if>
 		</where>