Merge remote-tracking branch 'origin/dev' into dev

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EquipmentCommandBillPlugin.java

@@ -134,7 +134,7 @@ public class EquipmentCommandBillPlugin extends AbstractBillPlugIn implements Be
                 return;
             }
             DynamicObject outOrgDy = (DynamicObject) outOrg;//调出组织
-            QFilter filter = new QFilter("org.id", "=", outOrgDy.get("id"));
+            QFilter filter = new QFilter("useorg.id", "=", outOrgDy.get("id"));//设备台账F7-使用组织
             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));