x

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

@@ -28,14 +28,18 @@ public class ReviewServiceImpl implements ReviewService {
 	@Override
 	public List<Map<String, Object>> queryReviewList(boolean is_review, Integer user_id, Date start_date, Date end_date, Integer film_type_id, Integer enroll_type_id, String keyword, Page page) {
 		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 and u.uid = ?", Integer.class, user_id);
-		SqlWhere where = new SqlWhere().ge("r.push_time", start_date).lt("r.push_time", end_date == null ? null : DateUtil.end(end_date)).in("r.review_round", ids.toArray()).eq("r.enroll_type_id", enroll_type_id).lk(new String[]{"en_name", "cn_name"}, keyword);
+		SqlWhere where = new SqlWhere()
+				.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)
+				.in("r.review_round", ids.toArray())
+				.lk(new String[]{"en_name", "cn_name"}, keyword)
+				;
 		if(is_review) {
-			where.ge("r.review_state", 2);
+			where.where("r.review_state is not null", null);
 		} else {
-			where.lt("r.review_state", 2);
+			where.where("r.review_state is null", null);
 		}
-		
-		
 		String sql = ""
 				+ "select "
 					+ "mf.*, "