diff --git a/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java b/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java
index 5b266377..12d02183 100644
--- a/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java
+++ b/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java
@@ -122,6 +122,27 @@ public class ToPageService extends ActionWeb {
         ro.put("fileTypes",fileTypes);
         return ro.toString();
     }
+
+    /**
+     * 查询子部门
+     * @param deptID
+     * @param deptIDList
+     * @return
+     */
+    public static ArrayList<String> getChildDept(String deptID,ArrayList<String> deptIDList) {
+        deptIDList.add(deptID);
+        Object[] sqlParams = new Object[]{};
+        sqlParams = new Object[]{deptID};
+        List<RowMap> subDeptMaps = DBSql.getMaps("SELECT ID FROM ORGDEPARTMENT WHERE PARENTDEPARTMENTID=?",sqlParams);
+        if (null!=subDeptMaps && !subDeptMaps.isEmpty()) {
+            for (RowMap subDeptMap : subDeptMaps) {
+                deptID = subDeptMap.getString("ID");
+                getChildDept(deptID,deptIDList);
+            }
+        }
+        return deptIDList;
+    }
+
     /**
      * @methodName:
      * @param:
@@ -133,6 +154,30 @@ public class ToPageService extends ActionWeb {
     public String frameView (UserContext uc, RequestParams params) {
         ResponseObject ro = ResponseObject.newOkResponse();
         String fileType = params.get("fileType");
+        String departId =params.get("departId");
+        List<String> list = new ArrayList<>();
+        if (departId.contains(",")){
+            String[] split = departId.split(",");
+            for (String departID:
+            split) {
+                ArrayList<String> childDept = getChildDept(departID, new ArrayList<>());
+                if (childDept.size()>0){
+                    for (String departid:
+                         childDept) {
+                        list.add(departid);
+                    }
+                }
+            }
+        }
+        System.out.println("list>>>>>>>>>>"+list);
+        String  sb ="(";
+        for (String departids:
+             list) {
+            sb+="'"+departids+"'"+",";
+        }
+        sb = sb.substring(0,sb.length()-1);
+        sb+=")";
+        System.out.println("sb>>>>>>>"+sb);
         System.out.println("======frameIDtoFrameView======" + frameIDtoFrameView);
         if (null != frameIDtoFrameView && !frameIDtoFrameView.equals("")) {
             //SDK.getLogAPI().consoleInfo("当前架构ID1"+frameID);
@@ -160,13 +205,15 @@ public class ToPageService extends ActionWeb {
                 fileMap.put("nodeType", nodeType);
                 fileMaps.add(fileMap);
                 //List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PUBDEPT,PLPARENTID,PLMETHODID,POLICYTYPE,FILESTATE,VIEWCOUNT FROM BO_EU_PAL_FILE1 WHERE PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy' OR PLMETHODID='data.form'");
-
+                List<RowMap> fileRowMaps =null;
                 //List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PLPARENTID,PLNAME,PLMETHODID,SUPPORTFILE,PUBDEPT,PUBDATETIME,PLORDERINDEX,PLLEVEL,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE PLPARENTID=? AND FILESTATE='1' AND (PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
+                if (sb.contains("'")){
+                    fileRowMaps =  DBSql.getMaps("SELECT ID AS FILEID,PLPARENTID,PLNAME,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLPARENTID=? AND ISPUBLISH = 1 AND EXT6 IN"+sb+" AND ISSTOP =0 AND EXT5 = '1' AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
+                }   else {
 
-                List<RowMap> fileRowMaps = DBSql.getMaps("SELECT ID AS FILEID,PLPARENTID,PLNAME,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLPARENTID=? AND ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
-
-
-
+                    fileRowMaps =  DBSql.getMaps("SELECT ID AS FILEID,PLPARENTID,PLNAME,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLPARENTID=? AND ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND (PLMETHODID='process.epc' OR PLMETHODID='control.policy' OR PLMETHODID='process.flowchart') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
+                }
+                System.out.println("fileRowMaps>>>>>>>>>>"+fileRowMaps);
                 ArrayList<RowMap> fileHandleRowMaps = new ArrayList<>();
                 Map<String, Object> reFileMap = new HashMap<>();
                 RowMap reFileRowMap = new RowMap(reFileMap);