咨询查询所有

cloud-site-service/src/main/java/com/yizhi/site/application/mapper/InformationMapper.java

@@ -25,6 +25,8 @@ public interface InformationMapper extends BaseMapper<Information> {
 
     List<Information> informationTwoList(InfomationParamVO vo, Page<Information> page);
 
+    List<Information> informationAllList(InfomationParamVO vo, Page<Information> page);
+
     List<Information>  informationThreeList(InfomationParamVO vo, Page<Information> page);
 
     List<AnnouncementVO> selectAnnouncement(Page<AnnouncementVO> page, Map<String, Object> map);

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/InformationServiceImpl.java

@@ -921,6 +921,9 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
         infomationParamVO.setState(2);
         Page<Information> page = new Page<Information>(vo.getPageNo(), vo.getPageSize());
         List<Information> list = Lists.newArrayList();
+        if(vo.getTypeId()==null||vo.getTypeId()==0L){
+            list = informationMapper.informationAllList(infomationParamVO, page);
+        }else {
             if (selectById == null) {
                 return null;
             }
@@ -930,12 +933,13 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
                 list = informationMapper.informationFirstList(infomationParamVO, page);
             } else {
                 DataClassification selectByParentId = dataClassificationService.selectById(selectById.getParentId());
-            if(selectByParentId==null || selectById.getParentId() == 0){
+                if (selectByParentId == null || selectById.getParentId() == 0) {
                     list = informationMapper.informationTwoList(infomationParamVO, page);//新闻分类列表
-            }else{
+                } else {
                     list = informationMapper.informationThreeList(infomationParamVO, page);//新闻分类列表
                 }
             }
+        }
         if (list.size() > 0 && list != null) {
             for (Information info : list) {
                 if (info.getTypeOne() != null && info.getTypeOne() != 0) {
@@ -985,6 +989,9 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
 
         Page<Information> page = new Page<Information>(vo.getPageNo(), vo.getPageSize());
         List<Information> list = null;
+        if(vo.getTypeId()==null||vo.getTypeId()==0L){
+            list = informationMapper.informationAllList(vo, page);
+        }else {
             DataClassification selectById = dataClassificationService.selectById(vo.getTypeId());
             if (selectById == null) {
                 return null;
@@ -995,12 +1002,13 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
                 list = informationMapper.informationFirstList(vo, page);
             } else {
                 DataClassification selectByParentId = dataClassificationService.selectById(selectById.getParentId());
-            if(selectByParentId==null || selectById.getParentId() == 0){
+                if (selectByParentId == null || selectById.getParentId() == 0) {
                     list = informationMapper.informationTwoList(vo, page);//新闻分类列表
-            }else{
+                } else {
                     list = informationMapper.informationThreeList(vo, page);//新闻分类列表
                 }
             }
+        }
         if (list.size() > 0 && list != null) {
             for (Information info : list) {
                 if (info.getTypeOne() != null && info.getTypeOne() != 0) {

cloud-site-service/src/main/resources/mapper/InformationMapper.xml

@@ -96,6 +96,25 @@
         order by a.is_top desc, a.create_time desc
     </select>
 
+    <select id="informationAllList" resultType="com.yizhi.site.application.domain.Information">
+        <!-- select a.* from information a left join data_classification b on a.type_two=b.id
+        where 1=1 and a.site_id=#{siteId} and b.site_id=#{siteId} and b.name=#{name}  -->
+        select a.* from information a where 1=1 and a.site_id=#{siteId}
+        <if test="fileName != null and fileName != ''">
+            and (a.file_name like CONCAT('%', '${fileName}', '%' ) or a.key_words like CONCAT('%', '${fileName}', '%' ) )
+        </if>
+        <!--        <if test="keyWords != null and keyWords != ''">-->
+        <!--            and a.key_words like CONCAT('%', '${keyWords}', '%' )-->
+        <!--        </if>-->
+        <if test="start != null">
+            and a.release_time >= #{start}
+        </if>
+        <if test="end != null">
+            and #{end} >= a.release_time
+        </if>
+        order by a.is_top desc, a.create_time desc
+    </select>
+
     <select id="informationPageList" resultType="com.yizhi.site.application.vo.site.InformationStudentVO">
 
             SELECT