diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaintenanceConfirmBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaintenanceConfirmBillPlugin.java
index d20441f..1c76a37 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaintenanceConfirmBillPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaintenanceConfirmBillPlugin.java
@@ -5,6 +5,7 @@ import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.entity.datamodel.events.ChangeData;
 import kd.bos.entity.datamodel.events.PropertyChangedArgs;
 import kd.bos.form.field.BasedataEdit;
+import kd.bos.form.field.RefBillEdit;
 import kd.bos.form.field.TextEdit;
 import kd.bos.form.field.events.BeforeF7SelectEvent;
 import kd.bos.form.field.events.BeforeF7SelectListener;
@@ -21,6 +22,7 @@ import java.util.EventObject;
  * 说明 1：过滤合同名称字段
  * 2：结算期间初始化赋值
  * 3：供应商赋值和必录逻辑
+ * 4：关联设备维修申请字段过滤
  */
 public class MaintenanceConfirmBillPlugin extends AbstractBillPlugIn implements BeforeF7SelectListener {
     @Override
@@ -30,6 +32,10 @@ public class MaintenanceConfirmBillPlugin extends AbstractBillPlugIn implements
         if (zcgj_contract != null) {
             zcgj_contract.addBeforeF7SelectListener(this);
         }
+        RefBillEdit zcgj_maintenance = this.getControl("zcgj_maintenance"); //关联设备维修申请
+        if (zcgj_maintenance != null) {
+            zcgj_maintenance.addBeforeF7SelectListener(this);
+        }
     }
 
     public void afterCreateNewData(EventObject e) {
@@ -81,14 +87,28 @@ public class MaintenanceConfirmBillPlugin extends AbstractBillPlugIn implements
     public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) {
         String name = beforeF7SelectEvent.getProperty().getName();
         ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter();
-        Object zcgj_accountorg = this.getModel().getValue("zcgj_accountorg");//核算组织
-        if (zcgj_accountorg != null) {
-            DynamicObject zcgj_accountorg1 = (DynamicObject) zcgj_accountorg;
-            QFilter qFilter = new QFilter("project.projectorg", QCP.equals, zcgj_accountorg1.getPkValue());
-            formShowParameter.getListFilterParameter().getQFilters().add(qFilter);
-        } else {
-            this.getView().showErrorNotification("请先填写财务记账组织！！");
-            beforeF7SelectEvent.setCancel(true);
+        if ("zcgj_contract".equals(name)) {
+            //合同名称
+            Object zcgj_accountorg = this.getModel().getValue("zcgj_accountorg");//核算组织
+            if (zcgj_accountorg != null) {
+                DynamicObject zcgj_accountorg1 = (DynamicObject) zcgj_accountorg;
+                QFilter qFilter = new QFilter("project.projectorg", QCP.equals, zcgj_accountorg1.getPkValue());
+                formShowParameter.getListFilterParameter().getQFilters().add(qFilter);
+            } else {
+                this.getView().showErrorNotification("请先填写财务记账组织！！");
+                beforeF7SelectEvent.setCancel(true);
+            }
+        } else if ("zcgj_maintenance".equals(name)) {
+            //设备维修申请
+            Object org = this.getModel().getValue("org");//所属组织
+            if (org != null) {
+                DynamicObject org1 = (DynamicObject) org;
+                QFilter qFilter = new QFilter("zcgj_accountorg", QCP.equals, org1.getPkValue());
+                formShowParameter.getListFilterParameter().getQFilters().add(qFilter);
+            } else {
+                this.getView().showErrorNotification("请先填写所属组织！！");
+                beforeF7SelectEvent.setCancel(true);
+            }
         }
     }
 }