x

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

@@ -403,7 +403,7 @@ public class FilmServiceImpl implements FilmService {
 			Integer opt_state, 
 			Integer[] film_type_id, 
 			Page page) {
-		SqlWhere where1 = new SqlWhere()
+		SqlWhere where = new SqlWhere()
 				.where("mf.film_type_name = agf.film_type_id and agf.group_id = ?", admin_group_id)
 				.eq("mf.state", state)
 				.eq("mf.apply_state", apply_state)
@@ -414,6 +414,11 @@ public class FilmServiceImpl implements FilmService {
 				.eq("mf.play_shanghai", play_shanghai)
 				.in("mf.film_type_id", film_type_id)
 				.lk("mf.keywords", keyword)
+				.where("r.film_id = mf.id")
+				.eq("r.review_round", review_round)
+				.eq("r.review_state", review_state)
+				.eq("r.allot_atate", allot_atate)
+				.eq("r.opt_state", opt_state)
 				;
 		String sql_film = "fc_member_film";
 		if(StringUtil.isNotBlank(enroll_type_id)) {
@@ -434,19 +439,9 @@ public class FilmServiceImpl implements FilmService {
 						+ "left join fc_film_group fg on fg.id = mf.film_group_id "
 						+ "left join fc_member m on m.id = mf.member_id "
 						+ "left join fc_admin a on a.adminid = mf.admin_creator"
-					+ ", fc_admin_group_filmtype agf"
-				+ StringUtil.join(" and ", " where ", " ", " ", where1.getStringList());
-		List<Object> objs = new ArrayList<Object>();
-		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)
-				;
-		sql = "select t.* from (" + sql + ") t" + StringUtil.join(" and ", " where ", " ", " ", where2.getStringList()) + " order by t.id desc";
-		objs.addAll(where2.getObjectList());
-		return jdbcTemplate.limit(sql, page, objs.toArray());
+					+ ", fc_review r, fc_admin_group_filmtype agf"
+				+ StringUtil.join(" and ", " where ", " ", " ", where.getStringList());
+		return jdbcTemplate.limit(sql, page, where.getObjectArray());
 	}
 
 	@Override