Browse Source

Merge remote-tracking branch 'origin/test'

anderx 7 years ago
parent
commit
75e158a19c
1 changed files with 2 additions and 5 deletions
  1. 2 5
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

+ 2 - 5
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -1571,7 +1571,7 @@
 			a.salesman_id = c.id left join admin d on
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department_management f on 
-			d.department_id = f.id left join business_varieties g on
+			c.department_id = f.id left join business_varieties g on
 			a.contract_type = g.id
 		where a.order_type = 0 and a.order_status = 3 
 			and (a.liquidation_status = 1 or a.liquidation_status = 2 or a.approval = 2) <!-- 已首付 or 已付清 or 已特批 -->
@@ -1619,7 +1619,7 @@
 			a.salesman_id = c.id left join admin d on
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department_management f on 
-			d.department_id = f.id left join business_varieties g on
+			c.department_id = f.id left join business_varieties g on
 			a.contract_type = g.id
 		where a.order_type = 0 and a.order_status = 3 
 			and (a.liquidation_status = 1 or a.liquidation_status = 2 or a.approval = 2) <!-- 已首付 or 已付清 or 已特批 -->
@@ -1653,9 +1653,6 @@
 		<if test="financeName != null and financeName != ''">
 			and d.name = #{financeName,jdbcType=VARCHAR}
 		</if>
-		<if test="page_sql != null">
-			${page_sql}
-		</if>
   </select>
   
   <select id="selectBillByOrderNo" parameterType="java.lang.String" resultType="com.goafanti.order.bo.BillListBo">