diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java
index 60f6a49..ca9cf50 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java
@@ -138,7 +138,6 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be
             DynamicObject[] equipmentInfos = BusinessDataServiceHelper.load("eceq_equipment_info", "id", new QFilter[]{filter});//设备台账F7
             List<Long> equipmentInfoIds = getIdsFromDynamicObjects(equipmentInfos);
             qFilters.add(new QFilter("id", QCP.in, equipmentInfoIds));
-            formShowParameter.getListFilterParameter().setQFilters(qFilters);
         } else if (StringUtil.equals(propertyName, "zcgj_outproject")) {
             // 调出项目
             Object outOrg = this.getModel().getValue("zcgj_outorg");//调出组织
@@ -152,13 +151,13 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be
             DynamicObject[] projectF7s = BusinessDataServiceHelper.load("ec_ecbd_projectf7", "id", new QFilter[]{filter});//工程项目
             List<Long> projectF7Ids = getIdsFromDynamicObjects(projectF7s);
             qFilters.add(new QFilter("id", QCP.in, projectF7Ids));
-            beforeF7SelectEvent.setCancel(true);
-            ListShowParameter ec_ecbd_projectf7 = ShowFormHelper.createShowListForm("ec_ecbd_projectf7", true);
-            ec_ecbd_projectf7.setCloseCallBack(new CloseCallBack(this, "zcgj_outproject"));
-            ec_ecbd_projectf7.setMultiSelect(false);
-            ec_ecbd_projectf7.setIsolationOrg(true);
-            ec_ecbd_projectf7.getListFilterParameter().setQFilters(qFilters);
-            this.getView().showForm(ec_ecbd_projectf7);
+//            beforeF7SelectEvent.setCancel(true);
+//            ListShowParameter ec_ecbd_projectf7 = ShowFormHelper.createShowListForm("ec_ecbd_projectf7", true);
+//            ec_ecbd_projectf7.setCloseCallBack(new CloseCallBack(this, "zcgj_outproject"));
+//            ec_ecbd_projectf7.setMultiSelect(false);
+//            ec_ecbd_projectf7.setIsolationOrg(true);
+//            ec_ecbd_projectf7.getListFilterParameter().setQFilters(qFilters);
+//            this.getView().showForm(ec_ecbd_projectf7);
         } else if (StringUtil.equals(propertyName, "zcgj_inproject")) {
             //调入项目
             Object inOrg = this.getModel().getValue("zcgj_inorg");//调入组织
@@ -172,13 +171,13 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be
             DynamicObject[] projectF7s = BusinessDataServiceHelper.load("ec_ecbd_projectf7", "id", new QFilter[]{filter});
             List<Long> projectF7Ids = getIdsFromDynamicObjects(projectF7s);
             qFilters.add(new QFilter("id", QCP.in, projectF7Ids));
-            beforeF7SelectEvent.setCancel(true);
-            ListShowParameter ec_ecbd_projectf7 = ShowFormHelper.createShowListForm("ec_ecbd_projectf7", true);
-            ec_ecbd_projectf7.setCloseCallBack(new CloseCallBack(this, "zcgj_inproject"));
-            ec_ecbd_projectf7.setMultiSelect(false);
-            ec_ecbd_projectf7.setIsolationOrg(true);
-            ec_ecbd_projectf7.getListFilterParameter().setQFilters(qFilters);
-            this.getView().showForm(ec_ecbd_projectf7);
+//            beforeF7SelectEvent.setCancel(true);
+//            ListShowParameter ec_ecbd_projectf7 = ShowFormHelper.createShowListForm("ec_ecbd_projectf7", true);
+//            ec_ecbd_projectf7.setCloseCallBack(new CloseCallBack(this, "zcgj_inproject"));
+//            ec_ecbd_projectf7.setMultiSelect(false);
+//            ec_ecbd_projectf7.setIsolationOrg(true);
+//            ec_ecbd_projectf7.getListFilterParameter().setQFilters(qFilters);
+//            this.getView().showForm(ec_ecbd_projectf7);
         } else if (propertyName.equals("zcgj_department")) {
             // 部门
             DynamicObject creator = this.getModel().getDataEntity().getDynamicObject("creator");//创建人
@@ -188,7 +187,6 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be
             List<Long> id = UserServiceHelper.getOrgsUserJoin(creator.getLong("id"));
             qFilters.add(new QFilter("id", QCP.in, id));
             formShowParameter.setCustomParam("isIncludeAllSub", "true");
-            formShowParameter.getListFilterParameter().setQFilters(qFilters);
         } else if (propertyName.equals("zcgj_org")) {
             // 所属组织
             DynamicObject costDept = (DynamicObject) this.getModel().getValue("zcgj_department");//部门
@@ -203,10 +201,10 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be
                     Long id = (Long) zcgj_org.get("id");
                     qFilters.add(new QFilter("id", QCP.in, id));
                     formShowParameter.setCustomParam("isIncludeAllSub", "true");
-                    formShowParameter.getListFilterParameter().setQFilters(qFilters);
                 }
             }
         }
+        formShowParameter.getListFilterParameter().setQFilters(qFilters);
     }
 
     public void closedCallBack(ClosedCallBackEvent closedCallBackEvent) {