x

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

@@ -748,10 +748,12 @@ public class ReviewServiceImpl implements ReviewService {
 					+ "mf.completion_date, "
 					+ "mf.play_shanghai, "
 					+ "rh.review_round state_3_round, "
+					+ "mfe.enroll_type_id original_enroll_type_id, "
 					+ "(select group_concat(fp.playactor_name) from fc_member_film_playactor fp where fp.film_id = mf.id and fp.playactor_type = 'director' group by fp.film_id, fp.playactor_type) director_name "
 				+ "from "
 					+ "fc_review r "
 						+ "left join fc_member_film mf on mf.id = r.film_id "
+						+ "left join fc_member_film_enroll mfe on mfe.film_id = r.film_id and mfe.enroll_type_id = 4 "
 						+ "left join fc_review_history rh on rh.enroll_type_id != 4 and rh.review_state = 3 and rh.review_id = r.id"
 					+ (enroll_type_id == null ? "" : (", fc_member_film_enroll mfe where mfe.film_id = r.film_id and mfe.enroll_type_id = " + enroll_type_id))
 				;
@@ -763,9 +765,9 @@ public class ReviewServiceImpl implements ReviewService {
 				;
 		if(from_round != null) {
 			if(from_round == 0) {
-				where.where("t.state_3_round is null");
+				where.where("t.original_enroll_type_id = 4");
 			} else {
-				where.eq("state_3_round", from_round);
+				where.eq("t.state_3_round", from_round);
 			}
 		}
 		sql = "select t.* from (" + sql + ") t " + StringUtil.join(" and ", " where ", "", where.getStringList()) + " order by t.film_id desc";