Sfoglia il codice sorgente

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

anderx 5 anni fa
parent
commit
8b52a521d5

+ 15 - 13
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -535,13 +535,14 @@
 		left join admin ad on b.creater = ad.id
 		left join t_order_new o on o.order_no = b.order_no
 		left join t_order_mid tm on tm.order_no=b.order_no
+		left join department d on o.order_dep = d.id
 	  	where 1=1 
-	  	<if test="fids != null and fids.size > 0">
-  		and o.finance_id in
-  		<foreach collection="fids" item="id" open="(" separator="," close=")">
-  		 #{id}
-  		</foreach>
-  		</if>
+	  	<if test="fids != null and fids.size() &gt; 0">
+	  	and d.finance_id in 
+	   <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+       		#{item}
+     	</foreach>
+		</if>
   	<if test="b.orderNo != null and b.orderNo != &quot;&quot;">
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>
@@ -577,13 +578,14 @@
 		left join admin ad on b.creater = ad.id
 		left join t_order_new o on o.order_no = b.order_no
 		left join t_order_mid tm on tm.order_no=b.order_no
-	  	where 1=1
-	<if test="fids != null and fids.size > 0">
-  		and o.finance_id in
-  		<foreach collection="fids" item="id" open="(" separator="," close=")">
-  		 #{id}
-  		</foreach>
-  	</if>
+	  	left join department d on o.order_dep = d.id
+	  	where 1=1 
+	  	<if test="fids != null and fids.size() &gt; 0">
+	  	and d.finance_id in 
+	   <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+       		#{item}
+     	</foreach>
+		</if>
   	<if test="b.orderNo != null and b.orderNo != &quot;&quot;">
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>