diff --git a/src/test/resources/bvt/parser/mysql-6.txt b/src/test/resources/bvt/parser/mysql-6.txt index 9045779040..cc155a9025 100644 --- a/src/test/resources/bvt/parser/mysql-6.txt +++ b/src/test/resources/bvt/parser/mysql-6.txt @@ -42,6 +42,14 @@ FROM (SELECT a.activity_offer_id AS adResourceId, a.title AS adResourceName, a.b , c.position_name AS positionName, c.charge_setting AS feeRegulation, a.priority_weight AS priorityWeight, a.audit_state AS adResourceState, 0 AS adResourceType , a.gmt_create, a.refuse_remark FROM q_activity_offer_enroll a, q_custinfo b, q_activity_position c + WHERE a.custid = b.custid + AND a.activity_position_id = c.activity_position_id + AND c.activity_id = ? + UNION ALL + SELECT a.reg_position_id AS adResourceId, b.custname AS adResourceName, NULL AS adResourceURL, a.custid, b.memberid + , c.position_name AS positionName, c.charge_setting AS feeRegulation, NULL AS priorityWeight, a.audit_state AS adResourceState, 1 AS adResourceType + , a.gmt_create, a.refuse_remark + FROM q_activity_custom_enroll a, q_custinfo b, q_activity_position c WHERE a.custid = b.custid AND a.activity_position_id = c.activity_position_id AND c.activity_id = ?