diff --git a/User/views.py b/User/views.py index 43dbda4..2a2a862 100644 --- a/User/views.py +++ b/User/views.py @@ -1411,15 +1411,16 @@ class roxyExhibition(APIView): except (ValueError, TypeError, AttributeError): itme["approvers_order"] = [] try: - from business.views import search_related_records + from business.views import conflict_search project_id = int(info.user_id) project = ProjectRegistration.objects.filter(id=project_id, is_deleted=False).first() - if project and project.client_info and project.party_info: - # 检索冲突记录 - conflict_records = search_related_records( - project.client_info, - project.party_info, + # 修复:只要有委托人或相对方任一不为空就进行冲突检索(相对方为非必填) + if project and (project.client_info or project.party_info): + # 使用 conflict_search 函数进行冲突检索(支持更灵活的参数组合) + conflict_records = conflict_search( + client_info=project.client_info, + party_info=project.party_info, exclude_project_id=project_id ) diff --git a/business/views.py b/business/views.py index dc0b4ac..e013fa4 100644 --- a/business/views.py +++ b/business/views.py @@ -674,8 +674,8 @@ class Project(APIView): if responsiblefor_dict.get('case_manager_lawyer'): responsible_desc += f",案管律师:{responsiblefor_dict.get('case_manager_lawyer')}" - # 检索相关记录(预立案、投标、立项) - related_records_info = search_related_records(client_info, party_info, exclude_project_id=pro.id) + # 检索相关记录(预立案、投标、立项)- 使用 conflict_search 函数,支持更灵活的参数组合 + related_records_info = conflict_search(client_info=client_info, party_info=party_info, exclude_project_id=pro.id) # 构建冲突信息文本(用于content字段,保持向后兼容) conflict_parts = []