Browse Source

Merge remote-tracking branch 'origin/test' into dev

anderx 6 years ago
parent
commit
d256e9e585
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

+ 4 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1098,7 +1098,7 @@ left join t_order_outsource too on o.order_no=too.order_no where delete_sign !=
 	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
 	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
 	  	</if>
 	  	</if>
 	  	<if test="fids != null and o.financeId != &quot;&quot;">
 	  	<if test="fids != null and o.financeId != &quot;&quot;">
-	  	and d.finance_id = 
+	  	and d.finance_id in 
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">
        		#{item}
        		#{item}
      	</foreach>
      	</foreach>
@@ -1151,7 +1151,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
 	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
 	  	</if>
 	  	</if>
 	  	<if test="fids != null and o.financeId != &quot;&quot;">
 	  	<if test="fids != null and o.financeId != &quot;&quot;">
-	  	and d.finance_id = 
+	  	and d.finance_id in 
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">
        		#{item}
        		#{item}
      	</foreach>
      	</foreach>
@@ -1552,8 +1552,8 @@ where super_id is null ) e on e.order_no=a.order_no
   		<if test="o.financeId != null and o.financeId != &quot;&quot;">
   		<if test="o.financeId != null and o.financeId != &quot;&quot;">
 	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
 	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
 	  	</if>
 	  	</if>
-	  	<if test="fids != null and o.financeId != &quot;&quot;">
-	  	and d.finance_id = 
+	  	<if test="fids != null and fids != &quot;&quot;">
+	  	and d.finance_id in 
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">
 	   <foreach item="item" collection="fids" separator="," open="(" close=")" index="">
         #{item}
         #{item}
        </foreach>
        </foreach>