diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index 1cbb759d8..d236c848d 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -668,12 +668,12 @@ class IssueLibrary(models.Model): passed_result = getattr(issue, field_passed, '') if passed_result in (False, 'reject'): # 班子上会:党的 party_char 不能为空 - if idx == 1: + if idx == 1 and ras.is_party == True: clean_party = re.sub(r'<[^>]+>', '', issue.party_char or '').strip() if not clean_party: raise UserError("党的意见为空,不能上班子会") # 董事上会:党的 party_char 和班子的 class_char 都不能为空 - elif idx == 2: + elif idx == 2 and ras.is_party == True and ras.is_class == True: clean_party = re.sub(r'<[^>]+>', '', issue.party_char or '').strip() clean_class = re.sub(r'<[^>]+>', '', issue.class_char or '').strip() if not clean_party: