diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java
index ce32a49..4fcbe09 100644
--- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java
+++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java
@@ -130,7 +130,6 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin  implement
     @Override
     public void beforeCreateFilterInfo(CreateFilterInfoEvent event) {
         super.beforeCreateFilterInfo(event);
-        System.out.println(666);
     }
 
 //    @Override
@@ -142,11 +141,12 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin  implement
     @Override
     protected void filterContainerInit(FilterContainerInitEvent contInitEvent, ReportQueryParam queryParam) {
         super.filterContainerInit(contInitEvent, queryParam);
-        FilterColumn orgFilter = contInitEvent.getFilterColumn("shkd_seluserpower");
     }
 
     @Override
     public void initDefaultQueryParam(ReportQueryParam queryParam) {
+        ReportFilter filter = this.getView().getControl("reportfilterap");//调用页面的自动查询
+        queryParam.setFilter(filter.getReportQueryParam().getFilter());
         super.initDefaultQueryParam(queryParam);
         Boolean shkd_isone = (Boolean) this.getModel().getValue("shkd_isone");//是否在第一层
         HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(RequestContext.get().getUserId()));
@@ -175,13 +175,13 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin  implement
         Object shkd_selorg = formShowParameter.getCustomParam("shkd_selorg");
         Object shkd_seldate = formShowParameter.getCustomParam("shkd_seldate");
         Object shkd_selmoney = formShowParameter.getCustomParam("shkd_selmoney");
-        Object shkd_isone = formShowParameter.getCustomParam("shkd_isone");
         if (shkd_selorg != null) {
-            this.getModel().setValue("shkd_selorg", shkd_selorg);
-            this.getModel().setValue("shkd_seldate", shkd_seldate);
-            this.getModel().setValue("shkd_selmoney", shkd_selmoney);
-            this.getModel().setValue("shkd_isone", shkd_isone);
-            this.getModel().setValue("shkd_seluserpower", null);
+            DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle((Long) shkd_selorg, "bos_org");
+            this.getView().getModel().setValue("shkd_selorg", dynamicObject);
+            this.getView().getModel().setValue("shkd_seldate", shkd_seldate);
+            this.getView().getModel().setValue("shkd_selmoney", shkd_selmoney);
+            this.getView().getModel().setValue("shkd_isone", false);
+            this.getView().getModel().setValue("shkd_seluserpower", null);
             ReportFilter filter = this.getView().getControl("reportfilterap");//调用页面的自动查询
             filter.search();
         }
@@ -344,31 +344,34 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin  implement
         QFilter filter = new QFilter("shkd_org", QCP.equals, id);
         DynamicObject paixu = BusinessDataServiceHelper.loadSingle("shkd_orgorderby", filter.toArray());
         if (paixu==null){
-            return;
-        }
-        DynamicObjectCollection shkd_entryentity = paixu.getDynamicObjectCollection("shkd_entryentity");
-        // 创建一个HashMap来存储转换后的结果
-        Map<String, Integer> map = new HashMap<>();
-        int s=0;
-        // 假设你可以通过遍历DynamicObjectCollection，来获取其中的元素
-        for (DynamicObject obj : shkd_entryentity) {
-            DynamicObject key = obj.getDynamicObject("shkd_ywdy");
-            int value = s++;
-            map.put(key.getString("number"), value);  // 将键值对放入HashMap
-        }
-
-        //按字段 组织配置 排序
-
-        Collections.sort(rowData , new Comparator<DynamicObject>(){
-            @Override
-            public int compare(DynamicObject dynamicObject1, DynamicObject dynamicObject2) {
-                return (map.get(dynamicObject1.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject1.getString("shkd_orgnumber")))-(map.get(dynamicObject2.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject2.getString("shkd_orgnumber")));
+            //添加“集团内债务融资未抵消“合计行
+            addheji(rowData);
+        }else {
+            DynamicObjectCollection shkd_entryentity = paixu.getDynamicObjectCollection("shkd_entryentity");
+            // 创建一个HashMap来存储转换后的结果
+            Map<String, Integer> map = new HashMap<>();
+            int s=0;
+            // 假设你可以通过遍历DynamicObjectCollection，来获取其中的元素
+            for (DynamicObject obj : shkd_entryentity) {
+                DynamicObject key = obj.getDynamicObject("shkd_ywdy");
+                int value = s++;
+                map.put(key.getString("number"), value);  // 将键值对放入HashMap
             }
 
-        });
+            //按字段 组织配置 排序
+
+            Collections.sort(rowData , new Comparator<DynamicObject>(){
+                @Override
+                public int compare(DynamicObject dynamicObject1, DynamicObject dynamicObject2) {
+                    return (map.get(dynamicObject1.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject1.getString("shkd_orgnumber")))-(map.get(dynamicObject2.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject2.getString("shkd_orgnumber")));
+                }
+
+            });
+            //添加“集团内债务融资未抵消“合计行
+            addheji(rowData);
+        }
+
 
-        //添加“集团内债务融资未抵消“合计行
-        addheji(rowData);
 
     }