From e9cc5528d9749b93d5a9d8e61c8400a67d40b7cf Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Thu, 29 Dec 2022 14:15:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FileMaterialServiceImpl.java          | 10 +++++++---
 .../mapper/fileMaterialCenter/FileMaterialMapper.xml   |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java
index a77beb1e..49f72ee1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java
+++ b/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
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
index 9642feb1..886a9f25 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
+++ b/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>