x

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

@@ -77,7 +77,7 @@ public class FilmGroupServiceImpl implements FilmGroupService {
 				+ "select "
 					+ "t.* "
 				+ "from "
-					+ "" + table + " t where t.film_group_id is null " + (StringUtil.isNotBlank(film_country) ? (" and t.film_country = '" + film_country + "'") : "");
+					+ "" + table + " t, fc_review r where r.film_id = t.id and r.opt_state = 3 and r.review_state != 2 and t.film_group_id is null " + (StringUtil.isNotBlank(film_country) ? (" and t.film_country = '" + film_country + "'") : "");
 		return jdbcTemplate.limit(sql, page);
 	}
 
@@ -95,11 +95,13 @@ public class FilmGroupServiceImpl implements FilmGroupService {
 				+ "select "
 					+ "t.*, "
 					+ "r.review_state, "
-					+ "r.review_round "
+					+ "r.review_round, "
+					+ "r.opt_state "
 				+ "from "
 					+ "" + table + " t left join fc_review r on r.film_id = t.id";
 		
 		SqlWhere wehre = new SqlWhere()
+				.where("tt.opt_state = 3 and tt.review_state != 1")
 				.in("tt.film_group_id", group_id)
 				.eq("tt.film_type_name", film_type_name)
 				.eq("tt.film_type_name_short", film_type_name_short)