资料中心类型条件查询修改

adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java

@@ -88,10 +88,14 @@ public class FileMaterialServiceImpl extends ServiceImpl<FileMaterialDao, FileMa
             }
             queryPage.setTreeIdList(treeIds);
         }
-        //dataType制空，不然节点重名会有bug
-        queryPage.setDataType(null);
         queryPage.setTreeId(null);
-        return fileMaterialDao.getFileMaterialPage(page,queryPage);
+        IPage<FileMaterial> fileMaterialPage = fileMaterialDao.getFileMaterialPage(page, queryPage);
+        if (ObjectUtils.isNotEmpty(queryPage.getDataType())) {
+            List<FileMaterial> fileMaterials = fileMaterialPage.getRecords().stream().filter(fileMaterial -> fileMaterial.getDataType().equals(queryPage.getDataType())).collect(Collectors.toList());
+            fileMaterialPage.setRecords(fileMaterials);
+            fileMaterialPage.setTotal(fileMaterials.size());
+        }
+        return fileMaterialPage;
     }
 
     @Override

adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml

@@ -38,9 +38,6 @@
         <if test="flieM.id != null and flieM.id != ''">
             and fm.id=#{flieM.id}
         </if>
-        <if test="flieM.dataType != null and flieM.dataType != ''">
-            AND fm.data_type like concat('%',#{flieM.dataType},'%')
-        </if>
         <if test="flieM.dataTitle != null and flieM.dataTitle != ''">
             AND fm.data_title like concat('%',#{flieM.dataTitle},'%')
         </if>