--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java

@@ -53,6 +53,7 @@ import com.zrqx.core.model.resource.ebook.Ebook;
 import com.zrqx.core.model.resource.ebook.EbookDiyType;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.datatype.ArrayUtils;
+import com.zrqx.core.util.datatype.StringUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
@@ -721,24 +722,61 @@ public class FgResourceLibraryController {
 	
 	private String filterFormat(String name){
 		if(StringUtils.isNotBlank(name)){
-			if(name.indexOf(")")>-1){
-				name = name.replace(name.substring(0,name.indexOf(")")+1), "");
-			}else
-			if(name.indexOf("）")>-1){
-				name = name.replace(name.substring(0,name.indexOf("）")+1), "");
-			}else
-			if(name.indexOf("、")>-1){
-				name = name.replace(name.substring(0,name.indexOf("、")+1), "");
-			}else
-			if(name.indexOf("章")>-1){
+			String[] arr = new String[]{"一", "二", "三", "四", "五", "六", "七", "八", "九", "十"};
+			if(name.indexOf("）") > -1 && name.indexOf("）") != (name.length() - 1)){
+				for(String a : arr){
+					if(name.indexOf(a + "）") > -1){
+						name = name.replace(name.substring(0,name.indexOf(a + "）")+2), "");
+					}
+				}
+			}
+			if(name.indexOf("、") > -1){
+				for(String a : arr){
+					if(name.indexOf(a + "、") > -1){
+						name = name.replace(name.substring(0,name.indexOf(a + "、")+2), "");
+					}
+				}
+			}
+			if(name.indexOf("第") > -1 && name.indexOf("章") > -1 && name.indexOf("章") != (name.length() - 1)){
 				name = name.replace(name.substring(0,name.indexOf("章")+1), "");
-			}else
-			if(name.indexOf("节")>-1){
+			}
+			if(name.indexOf("第") > -1 && name.indexOf("节") > -1 && name.indexOf("节") != (name.length() - 1)){
 				name = name.replace(name.substring(0,name.indexOf("节")+1), "");
 			}
-			if(name.indexOf("　")>-1){
-				name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+			int i = name.indexOf("　");
+			if(i > -1){
+				if(i > 0){
+					char c = name.charAt(i - 1); 
+					if (Character.isDigit(c)){
+						name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+					}
+				} else{
+					name = StringUtil.replaceOne(name, "　");
+				}
+			}
+			int j = name.indexOf(".");
+			if(j > -1){
+				if(j > 0){
+					char c = name.charAt(j - 1); 
+					if (Character.isDigit(c)){
+						name = name.replace(name.substring(0,name.indexOf(".")+1), "");
+					}
+				} else{
+					name = StringUtil.replaceOne(name, ".");
+				}
+			}
+			int k = name.indexOf(' ');
+			if(k > -1){
+				if(k > 0){
+					char c = name.charAt(k - 1); 
+					if (Character.isDigit(c)){
+						name = name.replace(name.substring(0,name.indexOf(' ')+1), "");
+					}
+				} else{
+					name = StringUtil.replaceOne(name, " ");
+				}
 			}
+			name = name.trim().replace("　", "");
 		}
 		return name;
 	}