diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index 79244e48f6f08d4333e4158a368b4847d74ecb74..b8477b38429b74c5c515508c49de790e33d5ecd1 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -38,8 +38,8 @@ public class PageDataResult {
     public PageDataResult(int totals,List<? extends NumberS> list,Integer offset){
         this.totals=totals;
         this.list=list;
-        for(int i=0;i<list.size();i++){
-            list.get(i).setNumberId(offset +i +1);
+        for(int i=0;i<this.list.size();i++){
+            this.list.get(i).setNumberId(offset +i +1);
         }
     }
 
diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java
index d921632a50a134b895f1dac454be15631b00a49d..bed931fd4920d661f96368238b88e288f7058b21 100644
--- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java
+++ b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java
@@ -86,6 +86,7 @@ public class CenterAuthShiroConfig {
         // 访问 /unauthorized/** 不通过JWTFilter
         filterRuleMap.put("/unauthorized/**","anon");
         filterRuleMap.put("/open/**","anon");
+        //filterRuleMap.put("/rest/**","anon");
         factoryBean.setFilterChainDefinitionMap(filterRuleMap);
         return factoryBean;
     }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 46ddcf6fc1f131eca3df7b63a7af3491424c600c..3db8c7988dbb5b0ace7c76e8d2604322c86ec1f6 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -196,28 +196,33 @@ public class VfileMenuController {
                 dataType = "Integer", paramType = "query", defaultValue = "")
     })*/
     @PostMapping("/find")
-    public PageDataResult queryFilesByObj(@ApiParam(value="当前页码",required = true,defaultValue = "1") Integer page,
-                                          @ApiParam(value="每页数据条数",required = true,defaultValue = "10") Integer results,
-                                          /*@ApiParam(value="vfileMenu")*/ VfileMenu vfileMenu){
+    public PageDataResult queryFilesByObj(//@ApiParam(value="当前页码",required = true,defaultValue = "1")@RequestBody Integer page,
+                                          //@ApiParam(value="每页数据条数",required = true,defaultValue = "2")@RequestBody Integer results,
+                                          /*@ApiParam(value="文件名称")String fileName,
+                                          @ApiParam(value="文件年份")Integer fileYear,
+                                          @ApiParam(value="文件区域")String region,
+                                          @ApiParam(value="目录节点")Long menuId,
+                                          @ApiParam(value="文件类型")String fileType,
+                                          @ApiParam(value="文件安全等级")String fileSecurity){*/
+
+        @RequestBody VfileMenu vfileMenu){
+        Integer page=vfileMenu.getPage();
+        Integer results=vfileMenu.getResults();
         //if(vfil)
-        //vfileMenu=new VfileMenu(null,null,null,null,null,null,null,13L,2017);
-        PageDataResult pdr = new PageDataResult();
-        if (page == null || page == 0) {
+        System.out.println(page);
+        System.out.println(results);
+        System.out.println(vfileMenu.getFileYear());
+        if (page == null || page <= 0) {
             page = 1;
         }
-        if (results == null || results == 0)
+        if (results == null || results <= 0)
             results = 10;
         int offset=(page - 1) * results;
-        /*pdr.setTotals(vfileMenuService.countFilesByObj(vfileMenu));*/
-        /*List<VfileMenu> vfileMenuList = vfileMenuService.queryFilesByObj(offset,results,vfileMenu);*/
+
         return new PageDataResult(vfileMenuService.countFilesByObj(vfileMenu),
                 vfileMenuService.queryFilesByObj(offset,results,vfileMenu),
                 offset);
-        /*for(int i=0;i<vfileMenuList.size();i++){
-            vfileMenuList.get(i).setNumberId((page-1)*results + i + 1);
-        }
-        pdr.setList(vfileMenuList);*/
-        //return pdr;
+
     }
 
 }
diff --git a/src/main/java/com/cetc32/dh/entity/NumberS.java b/src/main/java/com/cetc32/dh/entity/NumberS.java
index 700c767c7ae2db68cbb8165321b27ec95e25b349..592d41d7d5a358a181b720bc2ba59c2a0922b081 100644
--- a/src/main/java/com/cetc32/dh/entity/NumberS.java
+++ b/src/main/java/com/cetc32/dh/entity/NumberS.java
@@ -1,7 +1,28 @@
 package com.cetc32.dh.entity;
 
-public class NumberS {
+import java.io.Serializable;
+
+public class NumberS implements Serializable {
     private Integer numberId;
+    Integer page;
+    Integer results;
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getResults() {
+        return results;
+    }
+
+    public void setResults(Integer results) {
+        this.results = results;
+    }
+
 
     public Integer getNumberId() {
         return numberId;
diff --git a/src/main/java/com/cetc32/dh/entity/VfileMenu.java b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
index b5d12371fd8d109827ac4c24d373a633177444df..21256ef92b9877b25316436912a0817b3302b93b 100644
--- a/src/main/java/com/cetc32/dh/entity/VfileMenu.java
+++ b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
@@ -11,6 +11,7 @@ package com.cetc32.dh.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Date;
 import javax.persistence.*;
@@ -25,7 +26,6 @@ import javax.persistence.*;
 @ApiModel("文件实体")
 @Table(name = "vfile_menu")
 public class VfileMenu extends NumberS{
-
     /**
      * 无参构造函数
      */
@@ -70,21 +70,21 @@ public class VfileMenu extends NumberS{
     /**
      * 文件名字fileName
      */
-    @ApiModelProperty(value="文件名",example = "")
+    @ApiModelProperty(value="文件名")
     @Column(name = "file_name")
     private String fileName;
 
     /**
      * 文件类型fileType
      */
-    @ApiModelProperty(value="文件类型",example = "")
+    @ApiModelProperty(value="文件类型")
     @Column(name = "file_type")
     private String fileType;
 
     /**
      * 文件安全等级fileSecurity
      */
-    @ApiModelProperty(value="文件安全等级",example = "")
+    @ApiModelProperty(value="文件安全等级")
     @Column(name = "file_security")
     private String fileSecurity;
 
@@ -105,21 +105,21 @@ public class VfileMenu extends NumberS{
     /**
      * 文件区域region
      */
-    @ApiModelProperty(value="文件区域",example = "")
+    @ApiModelProperty(value="文件区域")
     @Column(name = "region")
     private String region;
 
     /**
      * 目录节点menuId
      */
-    @ApiModelProperty(value="目录节点",example = "")
+    @ApiModelProperty(value="目录节点")
     @Column(name = "menu_id")
     private Long menuId;
 
     /**
      * 文件年份fileYear
      */
-    @ApiModelProperty(value="文件年份",example = "")
+    @ApiModelProperty(value="文件年份")
     @Column(name = "file_year")
     private Integer fileYear;
 
@@ -127,7 +127,9 @@ public class VfileMenu extends NumberS{
      * @return file_id
      */
     public Long getFileId() {
-        return fileId;
+        if(null!=fileId)
+            return fileId;
+        return null;
     }
 
     /**
@@ -141,6 +143,8 @@ public class VfileMenu extends NumberS{
      * @return file_name
      */
     public String getFileName() {
+        if(StringUtils.isBlank(fileName))
+            return null;
         return fileName;
     }
 
@@ -155,6 +159,8 @@ public class VfileMenu extends NumberS{
      * @return file_type
      */
     public String getFileType() {
+        if(StringUtils.isBlank(fileType))
+            return null;
         return fileType;
     }
 
@@ -169,6 +175,8 @@ public class VfileMenu extends NumberS{
      * @return file_security
      */
     public String getFileSecurity() {
+        if(StringUtils.isBlank(fileSecurity))
+            return null;
         return fileSecurity;
     }
 
@@ -183,6 +191,9 @@ public class VfileMenu extends NumberS{
      * @return file_path
      */
     public String getFilePath() {
+
+        if(StringUtils.isBlank(filePath))
+            return null;
         return filePath;
     }
 
@@ -211,6 +222,8 @@ public class VfileMenu extends NumberS{
      * @return region
      */
     public String getRegion() {
+        if(StringUtils.isBlank(region))
+            return null;
         return region;
     }
 
diff --git a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
index d1102067c75c1c17956c7b0fd38596c99e200a8d..35f677cba15f001b3ecf63e6f5a432c280d58736 100644
--- a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
@@ -98,6 +98,7 @@ public class VfileMenuServiceImpl implements VfileMenuService {
      * @param vfileMenu
      * @return Integer
      */
+    @Override
     public Integer countFilesByObj(VfileMenu vfileMenu){
         return vfileMenuMapper.countFilesByObj(vfileMenu);
     }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e38f4d1ac34d81599aac90b65ee18ffa38712240..e8029e895cab6953f2e0cbc49797f8b812b250ba 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -34,3 +34,6 @@ generator:
   javaModel-targetPackage: com.cetc32.dh.entity
   sqlMap-targetPackage: mapper
   javaClient-targetPackage: com.cetc32.dh.mybatis
+logging:
+  level:
+    com.cetc32.dh.mybatis: debug
\ No newline at end of file
diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml
index 7da57bc2daba55e075e4f032bf5571fd9028b3ef..f3a65e9c4475f3c352cb9dc76053d8d59bd0959c 100644
--- a/src/main/resources/application-xwy.yml
+++ b/src/main/resources/application-xwy.yml
@@ -54,3 +54,6 @@ generator:
   javaModel-targetPackage: com.cetc32.dh.entity
   sqlMap-targetPackage: mapper
   javaClient-targetPackage: com.cetc32.dh.mybatis
+logging:
+  level:
+    com.cetc32.dh.mybatis: debug
\ No newline at end of file
diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml
index 6e125b09c0959655e4180441fb524f965643f1b2..42aab3bc738df6568d81568ab77b5081a4eaeccc 100644
--- a/src/main/resources/mapper/VfileMenuMapper.xml
+++ b/src/main/resources/mapper/VfileMenuMapper.xml
@@ -60,7 +60,7 @@
 
     <select id="queryFilesByObj" resultMap="BaseResultMap" parameterType="com.cetc32.dh.entity.VfileMenu">
         select * from vfile_menu
-        <trim prefix="where" prefixOverrides="and |or ">
+        <where>
             <if test="vfileMenu.menuId!= null">
                 and menu_id = #{vfileMenu.menuId}
             </if>
@@ -79,14 +79,14 @@
             <if test="vfileMenu.fileSecurity!=null">
                 and file_security = #{vfileMenu.fileSecurity}
             </if>
-        </trim>
+        </where>
         limit #{offset}, #{limit}
     </select>
 
 
     <select id="countFilesByObj" resultType="java.lang.Integer" parameterType="com.cetc32.dh.entity.VfileMenu">
         select count(*) from vfile_menu
-        <trim prefix="where" prefixOverrides="and |or ">
+        <where>
             <if test="menuId!= null">
                 and menu_id = #{menuId}
             </if>
@@ -105,6 +105,6 @@
             <if test="fileSecurity!=null">
                 and file_security = #{fileSecurity}
             </if>
-        </trim>
+        </where>
     </select>
 </mapper>
\ No newline at end of file