|
|
@@ -546,7 +546,7 @@
|
|
|
and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="b.departmentId != null and b.departmentId != """>
|
|
|
- and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
|
|
|
+ and o.order_dep = #{b.departmentId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="b.creater != null and b.creater != """>
|
|
|
and b.creater = #{b.creater,jdbcType=VARCHAR}
|
|
|
@@ -559,9 +559,6 @@
|
|
|
<bind name="n" value="'%' + b.payeeName + '%'" />
|
|
|
and a.nickname like #{n,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
- <if test="b.departmentId != null and b.departmentId != "" ">
|
|
|
- and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
<if test="b.startTime != null and b.startTime != "" and b.endTime != null and b.endTime != """>
|
|
|
<bind name="a" value="b.startTime + ' 00:00:00'" />
|
|
|
<bind name="e" value="b.endTime + ' 23:59:59'" />
|
|
|
@@ -594,7 +591,7 @@
|
|
|
and b.creater = #{b.creater,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="b.departmentId != null and b.departmentId != """>
|
|
|
- and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
|
|
|
+ and o.order_dep = #{b.departmentId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="b.payerName != null and b.payerName != """>
|
|
|
<bind name="nn" value="'%' + b.payerName + '%'" />
|
|
|
@@ -604,9 +601,6 @@
|
|
|
<bind name="n" value="'%' + b.payeeName + '%'" />
|
|
|
and a.nickname like #{n,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
- <if test="b.departmentId != null and b.departmentId != "" ">
|
|
|
- and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
<if test="b.startTime != null and b.startTime != "" and b.endTime != null and b.endTime != """>
|
|
|
<bind name="a" value="b.startTime + ' 00:00:00'" />
|
|
|
<bind name="e" value="b.endTime + ' 23:59:59'" />
|