x

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

@@ -108,12 +108,12 @@ public class ReviewServiceImpl implements ReviewService {
 			Integer enroll_type_id, 
 			Page page) {
 		SqlWhere where = new SqlWhere()
-				.where(is_review ? "r.review_state is not null" : "r.review_state is null", new Object[]{})
-				.where("r.review_round in (select ugf.fun_id from fc_user_group_fun ugf, fc_user u where ugf.group_id = u.group_id and u.uid = ?)", new Object[]{user_id})
+				.lk(new String[]{"mf.en_name", "mf.cn_name"}, keyword)
 				.ge("r.push_time", start_date)
 				.lt("r.push_time", end_date == null ? null : DateUtil.end(end_date))
 				.eq("r.enroll_type_id", enroll_type_id)
-				.lk(new String[]{"mf.en_name", "mf.cn_name"}, keyword)
+				.where("r.review_round in (select ugf.fun_id from fc_user_group_fun ugf, fc_user u where ugf.group_id = u.group_id and u.uid = ?)", new Object[]{user_id})
+				.where(is_review ? "rr.review_state is not null" : "rr.review_state is null", new Object[]{})
 				;
 		String sql = ""
 				+ "select "