diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 262a98fc7..c0ae4fced 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -114,7 +114,7 @@ class SoongWorkflowMixin(models.AbstractModel): elif hasattr(self, 'users_id') and self.users_id: query_user_id = self.users_id.id else: - query_user_id = current_user_id + query_user_id = self.env.user.id if self.log_ids: if query_user_id == current_user_id and self.work_end and self.log_ids[-1].approval_state in ['0', '1']: self.is_active = True @@ -351,7 +351,7 @@ class SoongWorkflowMixin(models.AbstractModel): state = '询价' self_state = state_list.index(state) # 当前节点 - if btn_rec.name != '结束': + if btn_rec.name != ['结束', '归档']: current_node = node_list[state_list.index(state)] self.env['trans.link'].search([]).unlink() # 退回节点根据日志进行判断