x

src/main/java/com/egolm/film/api/service/impl/FilmServiceImpl.java

@@ -427,8 +427,7 @@ public class FilmServiceImpl implements FilmService {
 					+ "r.allot_state, "
 					+ "r.opt_state, "
 					+ "m.username member_name, "
-					+ "a.realname admin_name, "
-					+ "(select group_concat(fp.playactor_name) from fc_member_film_playactor fp where fp.film_id = mf.id and fp.playactor_type = 'director') director_name "
+					+ "a.realname admin_name "
 				+ "from " + sql_film + " mf "
 						+ "left join fc_review r on r.film_id = mf.id "
 						+ "left join fc_film_group fg on fg.id = mf.film_group_id "
@@ -446,15 +445,8 @@ public class FilmServiceImpl implements FilmService {
 				.eq("t.review_state", review_state)
 				.eq("t.allot_atate", allot_atate)
 				.eq("t.opt_state", opt_state)
+				.lk("t.keywords", keyword)
 				;
-		if(StringUtil.isNotBlank(keyword)) {
-			String lkstr = "%" + keyword + "%";
-			if(keyword.matches("\\d+")) {
-				where2.where("(t.film_no = ? or t.en_name like ? or t.cn_name like ? or t.director_name like ?)", new Object[] {Integer.valueOf(keyword), lkstr, lkstr, lkstr});
-			} else {
-				where2.lk(new String[]{"t.en_name", "t.cn_name", "t.director_name"},  keyword);
-			}
-		}
 		sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", " ", " ", where2.getStringList()) + " order by t.id desc";
 		Object[] ary2 = where2.getObjectArray();
 		for(Object obj : ary2) {