x

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

@@ -27,7 +27,8 @@ public class ReviewServiceImpl implements ReviewService {
 
 	@Override
 	public List<Map<String, Object>> queryReviewList(boolean is_review, Integer user_id, Date push_date, Integer film_type_id, Integer enroll_type_id, String keyword, Page page) {
-		SqlWhere where = new SqlWhere().eq("r.enroll_type_id", enroll_type_id).lk(new String[]{"en_name", "cn_name"}, keyword);
+		List<Integer> ids = jdbcTemplate.queryForObjects("select ugf.fun_id from fc_user_group_fun ugf, fc_user u where ugf.group_id = u.group_id", Integer.class, user_id);
+		SqlWhere where = new SqlWhere().in("r.review_round", ids.toArray()).eq("r.enroll_type_id", enroll_type_id).lk(new String[]{"en_name", "cn_name"}, keyword);
 		if(is_review) {
 			where.ge("r.review_state", 2);
 		} else {
@@ -56,7 +57,8 @@ public class ReviewServiceImpl implements ReviewService {
 				+ "where "
 					+ "    mf.id = r.film_id "
 					+ "and r.id = rr.review_id "
-					+ "and r.review_round = rr.review_round"
+					+ "and r.review_round = rr.review_round "
+					+ "and r.review_round in ()"
 					+ "and rr.user_id = " + user_id 
 					+ StringUtil.join(" and ", " and ", "", "", where.getStringList());
 		return jdbcTemplate.limit(sql, page, where.getObjectList());