diff --git a/src/main/resources/mapper/RentCarRuleMapper.xml b/src/main/resources/mapper/RentCarRuleMapper.xml index 2bde22c..8ef3e2e 100644 --- a/src/main/resources/mapper/RentCarRuleMapper.xml +++ b/src/main/resources/mapper/RentCarRuleMapper.xml @@ -26,7 +26,7 @@ r.extend4 AS extend4, r.extend5 AS extend5 FROM ( - SELECT DISTINCT mp.car_rule_id + SELECT DISTINCT mp.car_rule_id,s.operating_company_id FROM zc_car_model cm JOIN zc_car c ON cm.id = c.model_id JOIN zc_company_store s ON c.store_id = s.id @@ -37,7 +37,7 @@ AND cm.del_flag = '0' AND cm.status = '0' ) tmp - JOIN zc_rent_car_rule r ON tmp.car_rule_id = r.id + JOIN zc_rent_car_rule r ON tmp.car_rule_id = r.id and r.operating_company_id = tmp.operating_company_id WHERE r.del_flag = '0' AND r.status = '0'