--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgBookMapper.java

@@ -56,10 +56,10 @@ public interface FgBookMapper extends BaseMapper<Book> {
 	 * @date: 2019年1月11日 下午3:50:49
 	 */
 	@Select("<script>"
-			+ "select bb.id,bb.name,bb.mainBody,bb.year,bb.mainBodyId,bb.yearId,bb.periods,bb.status,bb.summary as synopsis,bb.editor,"
+			+ "select bb.id,bb.name,bb.mainBody,bb.year,bb.mainBodyId,bb.yearId,bb.periods,bb.status,bb.summary as synopsis,bb.executiveEditor,"
 			+ "bb.keywords,DATE_FORMAT(bb.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,bb.resourceType,bb.bookCover FROM res_book bb WHERE bb.status = 1 " 
 			+ "<if test = 'form.keywords != null' >"  
-			+ " and (bb.name like concat('%',#{form.keywords},'%') or bb.keywords like concat('%',#{form.keywords},'%') or bb.editor like concat('%',#{form.keywords},'%') or bb.year like concat('%',#{form.keywords},'%'))"
+			+ " and (bb.name like concat('%',#{form.keywords},'%') or bb.keywords like concat('%',#{form.keywords},'%') or bb.executiveEditor like concat('%',#{form.keywords},'%') or bb.year like concat('%',#{form.keywords},'%'))"
 			+ "</if>" 	
 			+ "<if test='form.year != null'>"  
 			+ " and bb.yearId = #{form.year} "