diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index b16fe257a..f9d67b26e 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -621,16 +621,20 @@ class SoongWorkflowCommentWizard(models.TransientModel): if self.node_btn_name == '加签': - current_node_log = self.sudo().env["soong.workflow.log"].search( - [ - ("model", "=", self.res_model), - ("res_id", "=", self.res_id), - ("done_by", "=", self.env.user.id), - ("node_id", "=", self.node_btn_id.node_id.id), - ], - order="create_date DESC", - limit=1 - ) + is_admin = self.env.user.id.has_group('base.group_system') + if not is_admin: + current_node_log = self.sudo().env["soong.workflow.log"].search( + [ + ("model", "=", self.res_model), + ("res_id", "=", self.res_id), + ("done_by", "=", self.env.user.id), + ("node_id", "=", self.node_btn_id.node_id.id), + ], + order="create_date DESC", + limit=1 + ) + else: + current_node_log = record_id.log_ids[-1] current_node_log.write({ "comment": self.comment, "approval_state": "2", # 已完成 diff --git a/yuthon_property_approval/views/property_fee_form_views.xml b/yuthon_property_approval/views/property_fee_form_views.xml index 9fb93bb5d..84dccba7d 100644 --- a/yuthon_property_approval/views/property_fee_form_views.xml +++ b/yuthon_property_approval/views/property_fee_form_views.xml @@ -4,7 +4,7 @@ property.fee.form.tree property.fee.form - +