@@ -382,8 +382,8 @@ class Trade extends Base{
if($params['returnCode']!=="")$where[]=["a.returnCode","like","%".$params['returnCode']."%"];
if($params['orderCode']!=="")$where[]=["b.orderCode","like","%".$params['orderCode']."%"];
$list = TradeReturn::alias("a")
- ->leftJoin('trade_pool d','a.logNo=d.logNo')
- ->leftJoin('assoc b','a.logNo=b.viceCode and b.type=2')
+ ->leftJoin('trade_pool d','a.logNo=d.logNo and d.is_del=0')
+ ->leftJoin('assoc b','a.logNo=b.viceCode and b.type=2 and b.is_del=0')
->leftJoin('qrd_info c','c.sequenceNo=b.orderCode and c.is_del=0')
->field('a.*,d.tag_type,d.relaNo,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,b.cancel_fee,c.customerName,c.customerNo')
->where($where)
