x

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

@@ -316,17 +316,22 @@ public class ReviewServiceImpl implements ReviewService {
 	
 	private int toReviewState(List<Fc_review_record> records) {
 		Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+		Integer noReviewCount = 0;
 		for(Fc_review_record record : records) {
-			Integer review_state = record.getReview_state();; 
+			Integer review_state = record.getReview_state();
+			if(review_state == 0) {
+				noReviewCount ++;
+			} else {
 				map.put(review_state, map.get(review_state) == null ? 1 : (map.get(review_state) + 1));
 			}
+		}
 		Collection<Integer> ary = map.values();
 		Integer maxCount = 0;
 		for(Integer count : ary) {
 			maxCount = count > maxCount ? count : maxCount;
 		}
 		if(maxCount > 0) {
-			Integer i = 0;
+			int i = 0;
 			Integer review_state = null;
 			for(Integer key : map.keySet()) {
 				Integer value = map.get(key);
@@ -335,9 +340,10 @@ public class ReviewServiceImpl implements ReviewService {
 					i++;
 				}
 			}
-			if(i.intValue() == 1 && review_state != null) {
+			
+			if(i == 1 && (noReviewCount == 0 || maxCount*2 > records.size())) {
 				return review_state;
-			} else {
+			} else if(i > 1 && noReviewCount == 0) {
 				return -1;
 			}
 		}