kangwei：

法律法规模块、标准规范模块修改-后端

@@ -69,20 +69,20 @@ public class MaterialInfoController {
      * @param pageSize
      * @param pageSize
      * @return
      * @return
      */
      */
-    @AutoLog(value = "厂区资料管理-分页列表查询")
+  /*  @AutoLog(value = "厂区资料管理-分页列表查询")
     @ApiOperation(value = "厂区资料管理-分页列表查询", notes = "厂区资料管理-分页列表查询")
     @ApiOperation(value = "厂区资料管理-分页列表查询", notes = "厂区资料管理-分页列表查询")
     @GetMapping(value = "/list")
     @GetMapping(value = "/list")
     public Result<IPage<MaterialInfo>> queryPageList(MaterialInfo materialInfo,
     public Result<IPage<MaterialInfo>> queryPageList(MaterialInfo materialInfo,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-      /*  String departIds = null;
+      *//*  String departIds = null;
         if (StringUtils.isBlank(materialInfo.getDepartId())&&StringUtils.isNotBlank(BaseContextHandler.getDeparts())) {
         if (StringUtils.isBlank(materialInfo.getDepartId())&&StringUtils.isNotBlank(BaseContextHandler.getDeparts())) {
             departIds = departService.getChildDepartId(BaseContextHandler.getDeparts());
             departIds = departService.getChildDepartId(BaseContextHandler.getDeparts());
         }else{
         }else{
             departIds = departService.getChildDepartId(materialInfo.getDepartId());
             departIds = departService.getChildDepartId(materialInfo.getDepartId());
         }
         }
         IPage<MaterialInfo> pageList = materialInfoService.getList(page, materialInfo, departIds);
         IPage<MaterialInfo> pageList = materialInfoService.getList(page, materialInfo, departIds);
-*/
+*//*
         Result<IPage<MaterialInfo>> result = new Result<IPage<MaterialInfo>>();
         Result<IPage<MaterialInfo>> result = new Result<IPage<MaterialInfo>>();
         Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
         Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
         QueryWrapper<MaterialInfo> queryWrapper = getMaterialInfoQueryWrapper(materialInfo);
         QueryWrapper<MaterialInfo> queryWrapper = getMaterialInfoQueryWrapper(materialInfo);
@@ -91,7 +91,7 @@ public class MaterialInfoController {
         result.setSuccess(true);
         result.setSuccess(true);
         result.setResult(pageList);
         result.setResult(pageList);
         return result;
         return result;
-    }
+    }*/
 
 
     @AutoLog(value = "厂区资料管理-法律法规分页列表")
     @AutoLog(value = "厂区资料管理-法律法规分页列表")
     @ApiOperation(value = "厂区资料管理-法律法规分页列表", notes = "厂区资料管理-法律法规分页列表")
     @ApiOperation(value = "厂区资料管理-法律法规分页列表", notes = "厂区资料管理-法律法规分页列表")
@@ -103,6 +103,9 @@ public class MaterialInfoController {
         Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
         Page<MaterialInfo> page = new Page<MaterialInfo>(pageNo, pageSize);
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper();
         QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper();
         queryWrapper.eq("del_flag","0");
         queryWrapper.eq("del_flag","0");
+        if(StringUtils.isNotEmpty(materialInfo.getFacInformationtype())){
+            queryWrapper.eq("fac_informationtype",materialInfo.getFacInformationtype());
+        }
         if(StringUtils.isNotEmpty(materialInfo.getFacInformationName())){
         if(StringUtils.isNotEmpty(materialInfo.getFacInformationName())){
             queryWrapper.like("fac_information_name",materialInfo.getFacInformationName());
             queryWrapper.like("fac_information_name",materialInfo.getFacInformationName());
         }
         }