Просмотр исходного кода

财务列表BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 6
Родитель
Сommit
179eed067f
1 измененных файлов с 3 добавлено и 6 удалено
  1. 3 6
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

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

@@ -1094,7 +1094,7 @@ left join t_order_outsource too on o.order_no=too.order_no where delete_sign !=
 	  	<if test="o.processStatus == 4">
 	  	<if test="o.processStatus == 4">
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
 	  	</if>
-	  	<if test="fids != null and o.financeId != &quot;&quot;">
+	  	<if test="fids != null and fids.size() > 0">
 	  	and d.finance_id in 
 	  	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}
@@ -1144,7 +1144,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 	  	<if test="o.processStatus == 4">
 	  	<if test="o.processStatus == 4">
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
 	  	</if>
-	  	<if test="fids != null and o.financeId != &quot;&quot;">
+	  	<if test="fids != null and fids.size() > 0">
 	  	and d.finance_id in 
 	  	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}
@@ -1548,10 +1548,7 @@ where super_id is null ) e on e.order_no=a.order_no
 	  	<if test="o.processStatus == 4">
 	  	<if test="o.processStatus == 4">
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
 	  	</if>
-  		<if test="o.financeId != null and o.financeId != &quot;&quot;">
-	  	and d.finance_id = #{o.financeId,jdbcType=VARCHAR}
-	  	</if>
-	  	<if test="fids != null and fids != &quot;&quot;">
+	  	<if test="fids != null and fids.size() > 0">
 	  	and d.finance_id in 
 	  	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}