--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/news/FgNewsController.java

@@ -58,7 +58,7 @@ public class FgNewsController {
 			pageParam.setOrderBy(" newPulishDate desc");
 		}
 		List<FgSearchListVO> list = service.page(entity,pageParam);
-		
+		this.regEx1(list);
 		return CallBack.success(new PageInfo<FgSearchListVO>(list));
 	}
 	/**
@@ -76,6 +76,15 @@ public class FgNewsController {
 			});
 		}
 	}
+	private void regEx1(List<FgSearchListVO> list){
+		if(ArrayUtils.isNotEmpty(list)){
+			list.forEach(li -> {
+				if(StringUtils.isNotBlank(li.getSynopsis())){
+					li.setSynopsis(removeLabel(li.getSynopsis()));
+				}
+			});
+		}
+	}
 	/**
 	 * 去标签
 	 * @param list

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/news/FgNewsMapper.java

@@ -25,7 +25,7 @@ public interface FgNewsMapper extends BaseMapper<News>{
 			+ "select be.newsid id,be.newsTitle name,be.cover,be.newPulishDate,be.contentSummary synopsis,be.clickNumber FROM  sys_news be  "  
 			+ "where 1=1 and be.newsStatus=1 "
 			+ "<if test = '"+ NOTBLANK +"(form.keywords)' >"  
-			+ " and be.newsTitle like concat('%',#{form.keywords}, '%') "
+			+ " and (be.newsTitle like concat('%',#{form.keywords}, '%') or be.keyWord like concat('%',#{form.keywords}, '%'))"
 			+ "</if>"
 			+ "</script>") 
 	List<FgSearchListVO> page(@Param("form")Pc_FgQueryForm form);