Merge branch 'feature/CHINARPA-4546' into feature/uat-tmp

@@ -917,10 +917,12 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
     #CHINARPA-4546 delaerName变为list，包含dealer_name_list[0]映射后对应的所有值 + dealer_name_list[-1]，比对时，任一完全一致为Y，全部不一致为N
     #CHINARPA-4546 delaerName变为list，包含dealer_name_list[0]映射后对应的所有值 + dealer_name_list[-1]，比对时，任一完全一致为Y，全部不一致为N
     dealer_name = []
     dealer_name = []
     if len(dealer_name_list) != 0:
     if len(dealer_name_list) != 0:
-        dealer_name_mapper_str = DealerMapping.objects.filter(cms_value=dealer_name_list[0]).first().mapping_value
-        dealer_name_mapper_list = dealer_name_mapper_str.split(',')
-        dealer_name.extend(dealer_name_mapper_list) # 映射后的所有值
         dealer_name.append(dealer_name_list[-1]) # CMS的最后一个值
         dealer_name.append(dealer_name_list[-1]) # CMS的最后一个值
+        dealer_name_mapper_obj = DealerMapping.objects.filter(cms_value=dealer_name_list[0]).first().mapping_value
+        if dealer_name_mapper_obj is not None:
+            dealer_name_mapper_str = dealer_name_mapper_obj.mapping_value
+            dealer_name_mapper_list = dealer_name_mapper_str.split(',')
+            dealer_name.extend(dealer_name_mapper_list) # 映射后的所有值
     issuer_dealer = []
     issuer_dealer = []
     issuer_dealer.append(cms_info.get('fapiaoIssuerDealer', '').strip())
     issuer_dealer.append(cms_info.get('fapiaoIssuerDealer', '').strip())
     compare_log.info('[get_se_cms_compare_info_auto] [新车发票] [application_id {0}] [dealer_name_mapper_list {1}] [dealer_name {2}] [issuer_dealer {3}]'
     compare_log.info('[get_se_cms_compare_info_auto] [新车发票] [application_id {0}] [dealer_name_mapper_list {1}] [dealer_name {2}] [issuer_dealer {3}]'
@@ -1482,10 +1484,12 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
     #CHINARPA-4546 delaerName变为list，包含dealer_name_list[0]映射后对应的所有值 + dealer_name_list[-1]，比对时，任一完全一致为Y，全部不一致为N
     #CHINARPA-4546 delaerName变为list，包含dealer_name_list[0]映射后对应的所有值 + dealer_name_list[-1]，比对时，任一完全一致为Y，全部不一致为N
     dealer_name = []
     dealer_name = []
     if len(dealer_name_list) != 0:
     if len(dealer_name_list) != 0:
-        dealer_name_mapper_str = DealerMapping.objects.filter(cms_value=dealer_name_list[0]).first().mapping_value
-        dealer_name_mapper_list = dealer_name_mapper_str.split(',')
-        dealer_name.extend(dealer_name_mapper_list) # 映射后的所有值
         dealer_name.append(dealer_name_list[-1]) # CMS的最后一个值
         dealer_name.append(dealer_name_list[-1]) # CMS的最后一个值
+        dealer_name_mapper_obj = DealerMapping.objects.filter(cms_value=dealer_name_list[0]).first().mapping_value
+        if dealer_name_mapper_obj is not None:
+            dealer_name_mapper_str = dealer_name_mapper_obj.mapping_value
+            dealer_name_mapper_list = dealer_name_mapper_str.split(',')
+            dealer_name.extend(dealer_name_mapper_list) # 映射后的所有值
     issuer_dealer = []
     issuer_dealer = []
     issuer_dealer.append(cms_info.get('fapiaoIssuerDealer', '').strip())
     issuer_dealer.append(cms_info.get('fapiaoIssuerDealer', '').strip())
     compare_log.info('[get_se_cms_compare_info] [新车发票] [application_id {0}] [dealer_name_mapper_list {1}] [dealer_name {2}] [issuer_dealer {3}]'
     compare_log.info('[get_se_cms_compare_info] [新车发票] [application_id {0}] [dealer_name_mapper_list {1}] [dealer_name {2}] [issuer_dealer {3}]'