x

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

@@ -129,7 +129,7 @@ public class AdminFirstController {
 		for(Fc_member_film_enroll enroll : enrolls) {
 			Integer enroll_type_id = enroll.getEnroll_type_id();
 			if(enroll_type_id == 1 || enroll_type_id == 2) {
-				if(enroll_1_2 == null) {
+				if(enroll_1_2 == null || enroll_1_2 == enroll_type_id) {
 					enroll_1_2 = enroll_type_id;
 				} else {
 					throw new XRException("不能同时申请亚新和金爵流程");