|  | @@ -256,7 +256,7 @@
 | 
											
												
													
														|  |                  AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 |  |                  AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |              <if test="noneTqType != null">
 |  |              <if test="noneTqType != null">
 | 
											
												
													
														|  | -                AND spo.mer_nos_ != '淘器微信'
 |  | 
 | 
											
												
													
														|  | 
 |  | +                AND (spo.mer_nos_ IS NULL OR spo.mer_nos_ != '淘器微信')
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |          </where>
 |  |          </where>
 | 
											
												
													
														|  |      </sql>
 |  |      </sql>
 | 
											
										
											
												
													
														|  | @@ -352,7 +352,7 @@
 | 
											
												
													
														|  |                  </if>
 |  |                  </if>
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |              <if test="noneTqType != null">
 |  |              <if test="noneTqType != null">
 | 
											
												
													
														|  | -                and spro.mer_no_ != '淘器微信'
 |  | 
 | 
											
												
													
														|  | 
 |  | +                and (spro.mer_no_ IS NULL OR spro.mer_no_ != '淘器微信')
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |          </where>
 |  |          </where>
 | 
											
												
													
														|  |  		order by spro.id_ desc
 |  |  		order by spro.id_ desc
 | 
											
										
											
												
													
														|  | @@ -383,7 +383,7 @@
 | 
											
												
													
														|  |          		</if>
 |  |          		</if>
 | 
											
												
													
														|  |          	</if>
 |  |          	</if>
 | 
											
												
													
														|  |              <if test="noneTqType != null">
 |  |              <if test="noneTqType != null">
 | 
											
												
													
														|  | -                and spro.mer_no_ != '淘器微信'
 |  | 
 | 
											
												
													
														|  | 
 |  | +                and (spro.mer_no_ IS NULL OR spro.mer_no_ != '淘器微信')
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |          </where>
 |  |          </where>
 | 
											
												
													
														|  |  		order by spro.id_ desc
 |  |  		order by spro.id_ desc
 |