|
@@ -198,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
WHERE 1=1
|
|
|
AND (r.scr_launch_company_id = #{paramMap.companyId} OR r.scr_receive_company_id = #{paramMap.companyId})
|
|
|
<if test="paramMap.zfiSupplierId != null and paramMap.zfiSupplierId != ''">
|
|
|
- AND (scy_id = #{paramMap.zfiSupplierId}
|
|
|
+ AND (scy_id = #{paramMap.zfiSupplierId} AND r.scr_status = '01'
|
|
|
OR
|
|
|
(r.scr_status = '01'AND c.scy_status = '00' AND c.scy_type = '02')
|
|
|
)
|