diff --git a/api/api_v1/endpoints/interview.py b/api/api_v1/endpoints/interview.py index 06d43d7..26192c8 100644 --- a/api/api_v1/endpoints/interview.py +++ b/api/api_v1/endpoints/interview.py @@ -91,8 +91,8 @@ def chkData(data): if 'pass_why' in res1: key16 = res1['pass_why'] res1['pass_why'] = pass_why_dict.get(key16, '') - if 'work_list' in i: - work_list = i['work_list'] + if 'work_list' in res1: + work_list = res1['work_list'] if work_list: work_list = [json.loads(i) for i in work_list] if isinstance(work_list[0], str): @@ -110,8 +110,8 @@ def chkData(data): else: work_list = [] res1['work_list'] = work_list - if 'project_undergo' in i: - project_undergo = i['project_undergo'] + if 'project_undergo' in res1: + project_undergo = res1['project_undergo'] if project_undergo: project_undergo = [json.loads(i) for i in project_undergo] if isinstance(project_undergo[0], str): @@ -119,8 +119,8 @@ def chkData(data): else: project_undergo = [] res1['project_undergo'] = project_undergo - if 'language' in i: - language = i['language'] + if 'language' in res1: + language = res1['language'] if language: language = [json.loads(i) for i in language] if isinstance(language[0], str): @@ -128,8 +128,8 @@ def chkData(data): else: language = [] res1['language'] = language - if 'remembrance' in i: - remembrance = i['remembrance'] + if 'remembrance' in res1: + remembrance = res1['remembrance'] if remembrance: remembrance = [json.loads(i) for i in remembrance] if isinstance(remembrance[0], str): diff --git a/models/interview_zsgc.py b/models/interview_zsgc.py index 01d00a3..c0cbc0c 100644 --- a/models/interview_zsgc.py +++ b/models/interview_zsgc.py @@ -296,8 +296,11 @@ class InterviewDo: def find_interview_sql(self): whereStr = '' findStr = '' - for fstr in self.find_column: - findStr += fstr + ', ' + if not self.find_column: + findStr = '*' + else: + for fstr in self.find_column: + findStr += fstr + ', ' for key, value in self.where.items(): if key in ['interview_id', 'hr_id', 'interview_name', 'hr_name']: # 多个条件 @@ -305,14 +308,16 @@ class InterviewDo: values = value.split(',') for index, i in enumerate(values): if index > 0: - whereStr += 'or ' + str(key) + 'like %' + "'" + i + "'" + '% ' + whereStr += 'or ' + str(key) + ' like ' + "'%" + i + "%'" + ' ' else: - whereStr += str(key) + 'like %' + "'" + i + "'" + '% ' + whereStr += str(key) + ' like ' + "'%" + i + "%'" + ' ' continue # 单个条件 - whereStr += str(key) + 'like %' + "'" + value + "'" + '% ' + whereStr += str(key) + ' like ' + "'%" + value + "%'" + ' ' continue if isinstance(value, str): + if not value.strip(): + continue whereStr += str(key) + ' = ' + "'" + value + "'" + ' ' continue whereStr += str(key) + ' = ' + str(value) + ' '