Commit ed22fa00 by 阳浪

门户搜素接口

parent 70908d2f
...@@ -2,6 +2,7 @@ package com.yizhi.site.application.service.impl; ...@@ -2,6 +2,7 @@ package com.yizhi.site.application.service.impl;
import java.util.*; import java.util.*;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.yizhi.site.application.domain.DataClassification; import com.yizhi.site.application.domain.DataClassification;
...@@ -19,6 +20,7 @@ import com.yizhi.site.application.vo.site.ClassificationVO; ...@@ -19,6 +20,7 @@ import com.yizhi.site.application.vo.site.ClassificationVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -151,6 +153,12 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio ...@@ -151,6 +153,12 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio
vo.setData(selectVoByMap); vo.setData(selectVoByMap);
} }
} }
// 名称检索
if(CollectionUtil.isNotEmpty(list)){
if(ObjectUtils.isNotEmpty(siteComponyIdVO.getBannerName())){
list = list.stream().filter(a->ObjectUtils.isNotEmpty(a.getName())&&a.getName().indexOf(siteComponyIdVO.getBannerName())>=0).collect(Collectors.toList());
}
}
return list; return list;
} }
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from information where 1=1 and site_id=#{siteId} and state=#{state} from information where 1=1 and site_id=#{siteId} and state=#{state}
<if test="fileName != null || fileName != ''"> <if test="fileName != null || fileName != ''">
and file_name like CONCAT('%', '${fileName}', '%' ) and (file_name like CONCAT('%', '${fileName}', '%' ) or key_words like CONCAT('%', '${fileName}', '%' ) )
</if> </if>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment