x

src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java

@@ -126,7 +126,6 @@ public class AdminFirstController {
 		List<Fc_member_film_enroll> enrolls = memberFilmService.queryFilmEnrollList(member_film_id);
 		
 		Integer enroll_1_2 = null;
-		Integer enroll_4 = null;
 		for(Fc_member_film_enroll enroll : enrolls) {
 			Integer enroll_type_id = enroll.getEnroll_type_id();
 			if(enroll_type_id == 1 || enroll_type_id == 2) {
@@ -135,15 +134,16 @@ public class AdminFirstController {
 				} else {
 					throw new XRException("不能同时申请亚新和金爵流程");
 				}
-			} else if(enroll_type_id == 4)  {
-				enroll_4 = enroll_type_id;
 			}
 		}
 		if(enroll_1_2 != null) {
 			reviewService.toFirstRound(member_film_id, enroll_1_2);
-		} else if(enroll_4 != null) {
-			reviewService.toFirstRound(member_film_id, enroll_4);
+		} else {
+			reviewService.toFirstRound(member_film_id, 4);
 		}
+		
+		
+		
 		Fc_member_film memberFilm = memberFilmService.queryMemberFilmById(member_film_id);
 		Fc_member member = memberService.getMemberById(memberFilm.getMember_id());
 		Locale locale = new Locale("zh", "CN");