Skip to content

Commit

Permalink
Merge branch 'hotfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
blackholll committed Jul 2, 2018
2 parents 4af9ff7 + a6cd884 commit 6fa49de
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion service/ticket/ticket_base_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -884,10 +884,12 @@ def handle_ticket(cls, ticket_id, request_data_dict):
add_relation = destination_participant

# 更新工单信息:基础字段及自定义字段, add_relation字段 需要下个处理人是部门、角色等的情况
cls.add_ticket_relation(ticket_id, add_relation) # 更新关系人信息
new_relation, msg = cls.add_ticket_relation(ticket_id, add_relation) # 更新关系人信息
ticket_obj.state_id = destination_state_id
ticket_obj.participant_type_id = destination_participant_type_id
ticket_obj.participant = destination_participant
if new_relation is not False:
ticket_obj.relation = new_relation
ticket_obj.save()

# 只更新需要更新的字段
Expand Down Expand Up @@ -940,6 +942,7 @@ def add_ticket_relation(cls, ticket_id, user_str):
new_relation = ','.join(new_relation_list) # 去重
ticket_obj.relation = new_relation
ticket_obj.save()
return new_relation, ''

@classmethod
@auto_log
Expand Down

0 comments on commit 6fa49de

Please sign in to comment.