|
@@ -115,8 +115,8 @@
|
|
|
cso_s.orderID AS orderID,
|
|
|
cso_s.shopOrderNo as shopOrderNos,
|
|
|
cso.shopOrderId as shopOrderId,
|
|
|
- s.checkMan,
|
|
|
- s.name AS shopName,
|
|
|
+ s.checkMan,
|
|
|
+ IF(crr.relationType = '1', s.name,IFNULL(s_a.name,'')) AS shopName,
|
|
|
(case when crr.relationType = '1' then u_cr.userName else u.userName
|
|
|
end) AS "userName",
|
|
|
(case when crr.relationType = '1' then u_cr.name else u.name
|
|
@@ -136,6 +136,8 @@
|
|
|
-- 供应商
|
|
|
LEFT JOIN shop s ON s.shopID = cso.shopID
|
|
|
LEFT JOIN cm_shop_order cso_s ON cso_s.shopOrderID = a.shopOrderID
|
|
|
+ LEFT JOIN cm_shop_order cso_a ON cso_a.shopOrderID = crr.shopOrderID
|
|
|
+ LEFT JOIN shop s_a ON s_a.shopID = cso_a.shopID
|
|
|
<where>
|
|
|
<if test="id != null and id != '' and id != 0 ">
|
|
|
AND a.id = #{id}
|