x

src/main/java/com/egolm/film/api/service/FilmService.java

@@ -133,7 +133,7 @@ public interface FilmService {
 	 * @return
 	 */
 	List<Map<String, Object>> queryReviewList(String keyword, Integer group_id, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short,
-			String film_country, Integer[] review_round, Integer[] review_state, Page page);
+			String film_country, Integer review_round, Integer[] review_state, Page page);
 
 	void allot(Long member_film_id, Integer enroll_type_id, Integer review_round, Integer[] user_id);
 

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

@@ -483,7 +483,7 @@ public class FilmServiceImpl implements FilmService {
 	 */
 	@Override
 	public List<Map<String, Object>> queryReviewList(String keyword, Integer group_id, Integer enroll_type_id, Integer film_type_name,
-			Integer film_type_name_short, String film_country, Integer[] review_round, Integer[] review_state,
+			Integer film_type_name_short, String film_country, Integer review_round, Integer[] review_state,
 			Page page) {
 		SqlWhere w1 = new SqlWhere()
 				.where("mf.film_type_name in (select agft.film_type_id from fc_admin_group_filmtype agft where agft.group_id = ?)", new Object[]{group_id})
@@ -492,7 +492,7 @@ public class FilmServiceImpl implements FilmService {
 				.eq("mf.film_type_name", film_type_name)
 				.eq("mf.film_type_name_short", film_type_name_short)
 				.eq("mf.film_country", film_country)
-				.in("mf.review_round", review_round)
+				.eq("mf.review_round", review_round)
 				;
 		String sql = "select mf.id, mf.review_round, mf.origion_name, mf.en_name, mf.cn_name, mf.film_type_name, mf.film_country, r.review_state, r.result_text, (select GROUP_CONCAT(mfd.playactor_name) from fc_member_film_playactor mfd where mfd.film_id = mf.id and mfd.playactor_type = 'director') director_name from fc_member_film mf left join fc_review r on r.film_id = mf.id and r.review_round = mf.review_round" + StringUtil.join(" and ", " where ", "", "", w1.getStringList());
 		if(enroll_type_id != null) {

src/main/java/com/egolm/film/api/web/admin/AdminReviewController.java

@@ -45,7 +45,7 @@ public class AdminReviewController {
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="index",                value="分页编号"),
 		@ApiImplicitParam(paramType="query", dataType="long",    required=true,  name="limit",                value="分页大小"),
 	})
-	public Object list(String keyword, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short, String film_country, Integer[] review_round, Integer[] review_state, Long index, Long limit) {
+	public Object list(String keyword, Integer enroll_type_id, Integer film_type_name, Integer film_type_name_short, String film_country, Integer review_round, Integer[] review_state, Long index, Long limit) {
 		index = index == null ? 1 : index;
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit);