Commit c2d45de6 authored by Quxl's avatar Quxl

x

parent 01b5bb24
...@@ -752,7 +752,6 @@ public class ReviewServiceImpl implements ReviewService { ...@@ -752,7 +752,6 @@ public class ReviewServiceImpl implements ReviewService {
+ "from " + "from "
+ "fc_review r " + "fc_review r "
+ "left join fc_member_film mf on mf.id = r.film_id " + "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" + "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)) + (enroll_type_id == null ? "" : (", fc_member_film_enroll mfe where mfe.film_id = r.film_id and mfe.enroll_type_id = " + enroll_type_id))
; ;
...@@ -764,9 +763,9 @@ public class ReviewServiceImpl implements ReviewService { ...@@ -764,9 +763,9 @@ public class ReviewServiceImpl implements ReviewService {
; ;
if(from_round != null) { if(from_round != null) {
if(from_round == 0) { if(from_round == 0) {
where.eq("t.enroll_type_name", 4); where.eq("t.enroll_type_name", "4");
} else { } else {
where.ne("t.t.enroll_type_name", 4).eq("t.state_3_round", from_round); where.ne("t.t.enroll_type_name", "4").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"; sql = "select t.* from (" + sql + ") t " + StringUtil.join(" and ", " where ", "", where.getStringList()) + " order by t.film_id desc";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment