--no commit message

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/controller/geographysign/FgResourceLibraryController.java

@@ -166,16 +166,16 @@ public class FgResourceLibraryController {
 				
 				input = regEx(input);
 				if (StringUtils.isNotBlank(input)) {
-//					String[] ch = input.split("\\s+");
+					String[] ch = input.split("\\s+");
 					StringBuffer q = new StringBuffer();
-//					for (int i = 0; i < ch.length; i++) {
-//						q.append(" keywords_yu : " + ch[i] + "* ");
-//						if (i != ch.length - 1) {
-//							fqSq.append(" && ");
-//						}
-//					}
+
 					q.append(" ( ");
-					q.append(" keywords_yu : " +input + " ");
+					for (int i = 0; i < ch.length; i++) {
+						q.append(" keywords_yu : " + ch[i] );
+						if (i != ch.length - 1) {
+							q.append(" && ");
+						}
+					}
 
 					q.append(" && reserve2 : " + form.getReserve2() + "");
 					q.append(" ) ");
@@ -360,7 +360,7 @@ public class FgResourceLibraryController {
 	private String regEx(String input) {
 		// 去掉特殊字符
 		if (!input.trim().equals("")) {
-			String regEx = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]";
+			String regEx = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？  ]";
 			Pattern p = Pattern.compile(regEx);
 			Matcher m = p.matcher(input);
 			input = m.replaceAll("").trim();