添加功能
This commit is contained in:
@@ -745,16 +745,13 @@ class IssueLibrary(models.Model):
|
|||||||
if passed_result == False:
|
if passed_result == False:
|
||||||
# 班子上会:党的 party_char 不能为空
|
# 班子上会:党的 party_char 不能为空
|
||||||
if idx == 1 and ras.is_party == True:
|
if idx == 1 and ras.is_party == True:
|
||||||
clean_party = re.sub(r'<[^>]+>', '', issue.party_char or '').strip()
|
if not ras.party_char:
|
||||||
if not clean_party:
|
|
||||||
raise UserError("党的意见为空,不能上班子会")
|
raise UserError("党的意见为空,不能上班子会")
|
||||||
# 董事上会:党的 party_char 和班子的 class_char 都不能为空
|
# 董事上会:党的 party_char 和班子的 class_char 都不能为空
|
||||||
elif idx == 2 and ras.is_party == True and ras.is_class == True:
|
elif idx == 2 and ras.is_party == True and ras.is_class == True:
|
||||||
clean_party = re.sub(r'<[^>]+>', '', issue.party_char or '').strip()
|
if not ras.party_char:
|
||||||
clean_class = re.sub(r'<[^>]+>', '', issue.class_char or '').strip()
|
|
||||||
if not clean_party:
|
|
||||||
raise UserError("党的意见为空,不能上董事会")
|
raise UserError("党的意见为空,不能上董事会")
|
||||||
if not clean_class:
|
if not ras.class_char:
|
||||||
raise UserError("班子意见为空,不能上董事会")
|
raise UserError("班子意见为空,不能上董事会")
|
||||||
if idx == 0:
|
if idx == 0:
|
||||||
party_meeting_name = "党总支" if user_company_name == "集团本部" else "党支委"
|
party_meeting_name = "党总支" if user_company_name == "集团本部" else "党支委"
|
||||||
|
|||||||
Reference in New Issue
Block a user