x

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

@@ -413,6 +413,7 @@ public class FilmServiceImpl implements FilmService {
 				.eq("mf.film_country", film_country)
 				.eq("mf.play_shanghai", play_shanghai)
 				.in("mf.film_type_id", film_type_id)
+				.lk("mf.keywords", keyword)
 				;
 		String sql_film = "fc_member_film";
 		if(StringUtil.isNotBlank(enroll_type_id)) {
@@ -436,22 +437,15 @@ public class FilmServiceImpl implements FilmService {
 					+ ", fc_admin_group_filmtype agf"
 				+ StringUtil.join(" and ", " where ", " ", " ", where1.getStringList());
 		List<Object> objs = new ArrayList<Object>();
-		Object[] ary1 = where1.getObjectArray();
-		for(Object obj : ary1) {
-			objs.add(obj);
-		}
+		objs.addAll(where1.getObjectList());
 		SqlWhere where2 = new SqlWhere()
 				.eq("t.review_round", review_round)
 				.eq("t.review_state", review_state)
 				.eq("t.allot_atate", allot_atate)
 				.eq("t.opt_state", opt_state)
-				.lk("t.keywords", 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) {
-			objs.add(obj);
-		}
+		objs.addAll(where2.getObjectList());
 		return jdbcTemplate.limit(sql, page, objs.toArray());
 	}