From f80dd824dc650315fc42689f0f1779c20884a6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Jun 2026 10:39:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizard/soong_workflow_comment_wizard_view.xml         | 8 --------
 .../wizard/soong_workflow_comment_wizard_inherit.xml      | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
index e3b64b642..881e5047a 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
@@ -88,10 +88,6 @@
                         <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}"
                                domain="[('note_setting_id.users_role_ids', 'in', user_role_ids)]"/>
                         <field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
-                        <field name="allowed_issue_ids" invisible="1"/>
-                        <field name="avoid_issue_ids" widget="many2many_tags"
-                               invisible="not is_avoid" options="{'no_create': True}"
-                               domain="[('id', 'in', allowed_issue_ids)]"/>
                         <field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
                     </div>
                     <group>
@@ -142,10 +138,6 @@
                         <field name="trans_link_id" string="转交节点" invisible="node_btn_name == '退回'"
                                domain="[('id', 'not in', invalid_link_ids), ('workflow_record_id', '=', workflow_record_id)]"
                                options="{'no_open': True}" widget="radio" force_save="1"/>
-                        <field name="is_avoid" invisible="res_model not in ['issue.party.approval', 'issue.boss.approval', 'issue.class.approval']"/>
-                        <field name="allowed_issue_ids" invisible="1"/>
-                        <field name="avoid_issue_ids" widget="many2many_tags"
-                               invisible="not is_avoid" options="{'no_create': True}" domain="[('id', 'in', allowed_issue_ids)]"/>
                         <field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
                         <field name="employee_trans_domain_ids" invisible="1"/>
                         <!--  退回意见退回类型  -->
diff --git a/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml b/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml
index 949954707..53e6b5bbd 100644
--- a/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml
+++ b/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml
@@ -12,7 +12,7 @@
                        invisible="res_model not in ['issue.party.approval', 'issue.boss.approval', 'issue.class.approval']"/>
                 <field name="allowed_issue_ids" invisible="1"/>
                 <field name="avoid_issue_ids" widget="many2many_tags"
-                       invisible="not is_avoid" options="{'no_create': True}"/>
+                       invisible="not is_avoid" options="{'no_create': True}" domain="[('id', 'in', allowed_issue_ids)]"/>
                 <field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
             </xpath>
 
@@ -20,7 +20,7 @@
             <xpath expr="//group[.//field[@name='document_ids']]/preceding-sibling::div//field[@name='comment_note']" position="after">
                 <field name="allowed_issue_ids" invisible="1"/>
                 <field name="avoid_issue_ids" widget="many2many_tags"
-                       invisible="not is_avoid" options="{'no_create': True}"/>
+                       invisible="not is_avoid" options="{'no_create': True}" domain="[('id', 'in', allowed_issue_ids)]"/>
                 <field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
             </xpath>
 

From 68a45cc0f0c065e974140ea80fa6ec983a44f4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 11 Jun 2026 10:41:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.py  | 2 --
 yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.py b/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.py
index 802176f96..3bb7b7e79 100644
--- a/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.py
+++ b/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.py
@@ -6,8 +6,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     _inherit = 'soong.workflow.comment.wizard'
 
     is_avoid = fields.Boolean(string='是否回避')
-    allowed_issue_ids = fields.Many2many('issue.library', 'soong_comment_wizard_allowed_issue_rel',
-                                         'wizard_id', 'issue_id', string='可选议题')
     issue_filter_ids = fields.Many2many('issue.library', 'soong_comment_wizard_issue_filter_rel',
                                         'wizard_id', 'issue_id', string='议题过滤')
     avoid_issue_ids = fields.Many2many('issue.library', 'soong_comment_wizard_avoid_issue_rel',
diff --git a/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml b/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml
index ba0b8dc36..351861c4a 100644
--- a/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml
+++ b/yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml
@@ -10,7 +10,6 @@
             <xpath expr="//field[@name='employee_trans_domain_ids']" position="before">
                 <field name="is_avoid"
                        invisible="res_model not in ['issue.party.approval', 'issue.boss.approval', 'issue.class.approval']"/>
-                <field name="allowed_issue_ids" invisible="1"/>
                 <field name="issue_filter_ids" invisible="1"/>
                 <field name="avoid_issue_ids" widget="many2many_tags"
                        invisible="not is_avoid" options="{'no_create': True}"
@@ -20,7 +19,6 @@
 
             <!-- 结束区域：插入 avoid 字段 -->
             <xpath expr="//group[.//field[@name='document_ids']]/preceding-sibling::div//field[@name='comment_note']" position="after">
-                <field name="allowed_issue_ids" invisible="1"/>
                 <field name="issue_filter_ids" invisible="1"/>
                 <field name="avoid_issue_ids" widget="many2many_tags"
                        invisible="not is_avoid" options="{'no_create': True}"