x

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

@@ -74,6 +74,7 @@ public class WebUtilController {
 				}
 			}
 			String enroll_type_name_other = (String)map.get("enroll_type_name_other");
+			String film_type_name = (String)map.get("film_type_name");
 			if(StringUtil.isNotBlank(enroll_type_name_other)) {
 				String[] strs = enroll_type_name_other.split(",");
 				if(!StringUtil.contains(strs, "8")) {
@@ -84,11 +85,7 @@ public class WebUtilController {
 						}
 					}
 				}
-			}
-			String film_type_name = (String)map.get("film_type_name");
-			if(StringUtil.isNotBlank(film_type_name) && film_type_name.equals("4")) {
-				String[] strs = enroll_type_name_other.split(",");
-				if(StringUtil.contains(strs, "6")) {
+				if(!film_type_name.equals("4")) {
 					String s = enroll_type_name_other.replace(",6,", ",").replace("6,", "").replace(",6", "").replace("6", "").replace(",,", ",");
 					objList.add(new Object[] {s, id});
 				}