!12501 !12500 会议

Merge pull request !12501 from 李鹏宇/dev
2026-07-27 07:38:51 +00:00
parent 5014c38b33 9ce265224c
commit 087f894753
1 changed files with 2 additions and 2 deletions
@@ -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: