x

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

@@ -2,6 +2,7 @@ package com.egolm.film.api.web.admin;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -93,32 +94,21 @@ 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")) {
-					for(String str : strs) {
-						if(Integer.valueOf(str).intValue() == 1) {
-							objList.add(new Object[] {(enroll_type_name_other + ",8"), id});
-							break;
-						}
-					}
-				}
-				if(!film_type_name.equals("4")) {
-					String s = enroll_type_name_other;
-					s = s.replace(",6,", ",").replace("6,", "").replace(",6", "").replace("6", "").replace(",,", ",");
-					s = s.replace(",7,", ",").replace("7,", "").replace(",7", "").replace("7", "").replace(",,", ",");
-					objList.add(new Object[] {s, id});
-				} else {
-					String s = enroll_type_name_other;
-					s = s.replace(",1,", ",").replace("1,", "").replace(",1", "").replace("1", "").replace(",,", ",");
-					s = s.replace(",2,", ",").replace("2,", "").replace(",2", "").replace("2", "").replace(",,", ",");
-					s = s.replace(",3,", ",").replace("3,", "").replace(",3", "").replace("3", "").replace(",,", ",");
-					s = s.replace(",4,", ",").replace("4,", "").replace(",4", "").replace("4", "").replace(",,", ",");
-					s = s.replace(",5,", ",").replace("5,", "").replace(",5", "").replace("5", "").replace(",,", ",");
-					s = s.replace(",8,", ",").replace("8,", "").replace(",8", "").replace("8", "").replace(",,", ",");
-					objList.add(new Object[] {s, id});
+			String[] strs = enroll_type_name_other.split(",");
+			if(StringUtil.contains(strs, "1") && !StringUtil.contains(strs, "8")) {
+				List<String> othersList = new ArrayList<String>();
+				for(String str : strs) {
+					othersList.add(str);
 				}
+				othersList.add("8");
+				othersList.sort(new Comparator<String>() {
+					@Override
+					public int compare(String s1, String s2) {
+						Integer v1 = Integer.valueOf(s1);
+						Integer v2 = Integer.valueOf(s2);
+						return v1.compareTo(v2);
+					}
+				});
 			}
 		}
 		if(enrolls.size() > 0) {