--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/articlelibrary/FgArticleLibraryController.java

@@ -453,10 +453,14 @@ public class FgArticleLibraryController {
 	
 	private String filterFormat(String name){
 		if(StringUtils.isNotBlank(name)){
+			String[] arr = new String[]{"一", "二", "三", "四", "五", "六", "七", "八", "九", "十"};
 			if(name.indexOf("）") > -1){
-				name = name.replace(name.substring(0,name.indexOf("）")+1), "");
+				for(String a : arr){
+					if(name.indexOf(a + "）") > -1){
+						name = name.replace(name.substring(0,name.indexOf(a + "）")+2), "");
+					}
+				}
 			}
-			String[] arr = new String[]{"一", "二", "三", "四", "五", "六", "七", "八", "九", "十"};
 			if(name.indexOf("、") > -1){
 				for(String a : arr){
 					if(name.indexOf(a + "、") > -1){
@@ -475,15 +479,19 @@ public class FgArticleLibraryController {
 			}
 			int i = name.indexOf("　");
 			if(i > -1){
-				char c = name.charAt(i - 1); 
-				if (Character.isDigit(c)){
-					name = name.replace(name.substring(0,name.indexOf("　")+1), "");
-				}
-				if (c == '.'){
-					name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+				if(i > 0){
+					char c = name.charAt(i - 1); 
+					if (Character.isDigit(c)){
+						name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+					}
+					if (c == '.'){
+						name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+					}
+				} else{
+					name = StringUtil.replaceOne(name, "　");
 				}
-				// name = StringUtil.replaceOne(name, " ");
 			}
+			name = name.trim().replace("　", "");
 		}
 		return name;
 	}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java

@@ -1071,10 +1071,14 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 	private void filterFormat(FgArticleLibraryListVO content){
 		String name = content.getName();
 		if(StringUtils.isNotBlank(name)){
+			String[] arr = new String[]{"一", "二", "三", "四", "五", "六", "七", "八", "九", "十"};
 			if(name.indexOf("）") > -1){
-				name = name.replace(name.substring(0,name.indexOf("）")+1), "");
+				for(String a : arr){
+					if(name.indexOf(a + "）") > -1){
+						name = name.replace(name.substring(0,name.indexOf(a + "）")+2), "");
+					}
+				}
 			}
-			String[] arr = new String[]{"一", "二", "三", "四", "五", "六", "七", "八", "九", "十"};
 			if(name.indexOf("、") > -1){
 				for(String a : arr){
 					if(name.indexOf(a + "、") > -1){
@@ -1093,14 +1097,17 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
 			}
 			int i = name.indexOf("　");
 			if(i > -1){
-				char c = name.charAt(i - 1); 
-				if (Character.isDigit(c)){
-					name = name.replace(name.substring(0,name.indexOf("　")+1), "");
-				}
-				if (c == '.'){
-					name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+				if(i > 0){
+					char c = name.charAt(i - 1); 
+					if (Character.isDigit(c)){
+						name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+					}
+					if (c == '.'){
+						name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+					}
+				} else{
+					name = StringUtil.replaceOne(name, "　");
 				}
-				// name = StringUtil.replaceOne(name, " ");
 			}
 			content.setName(name.trim().replace("　", ""));
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/resource/FgResourceLibraryServiceImpl.java

@@ -1147,10 +1147,14 @@ public class FgResourceLibraryServiceImpl implements FgResourceLibraryService {
 	@Override
 	public String filterFormat(String name){
 		if(StringUtils.isNotBlank(name)){
+			String[] arr = new String[]{"一", "二", "三", "四", "五", "六", "七", "八", "九", "十"};
 			if(name.indexOf("）") > -1){
-				name = name.replace(name.substring(0,name.indexOf("）")+1), "");
+				for(String a : arr){
+					if(name.indexOf(a + "）") > -1){
+						name = name.replace(name.substring(0,name.indexOf(a + "）")+2), "");
+					}
+				}
 			}
-			String[] arr = new String[]{"一", "二", "三", "四", "五", "六", "七", "八", "九", "十"};
 			if(name.indexOf("、") > -1){
 				for(String a : arr){
 					if(name.indexOf(a + "、") > -1){
@@ -1169,16 +1173,19 @@ public class FgResourceLibraryServiceImpl implements FgResourceLibraryService {
 			}
 			int i = name.indexOf("　");
 			if(i > -1){
-				char c = name.charAt(i - 1); 
-				if (Character.isDigit(c)){
-					name = name.replace(name.substring(0,name.indexOf("　")+1), "");
-				}
-				if (c == '.'){
-					name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+				if(i > 0){
+					char c = name.charAt(i - 1); 
+					if (Character.isDigit(c)){
+						name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+					}
+					if (c == '.'){
+						name = name.replace(name.substring(0,name.indexOf("　")+1), "");
+					}
+				} else{
+					name = StringUtil.replaceOne(name, "　");
 				}
-				// name = StringUtil.replaceOne(name, " ");
 			}
-			
+			name = name.trim().replace("　", "");
 		}
 		return name;
 	}