diff --git a/src/com/platform/service/impl/DataInfoServiceImp.java b/src/com/platform/service/impl/DataInfoServiceImp.java
index b2d10b92..6ad4d775 100644
--- a/src/com/platform/service/impl/DataInfoServiceImp.java
+++ b/src/com/platform/service/impl/DataInfoServiceImp.java
@@ -45,16 +45,26 @@ public class DataInfoServiceImp implements DataInfoService {
 			List<String> removelist = new ArrayList<String>();
 			List<String> alllist = new ArrayList<String>();
 			List<String> list = new ArrayList<String>();
+			//如果有查询数据库类型的
 			//去掉版本字段
 			Pattern pattern = Pattern.compile("^版本\\d+$");
 			if (null != querystr && !"".equals(querystr)) {
+				if (querystr.toLowerCase().contains("oracle")) {
+					pagerOptions.setDataBaseType("ORACLE");
+					querystr = querystr.toUpperCase().replaceAll("ORACLE", "");
+				}else if(querystr.toLowerCase().contains("sql server")){
+					pagerOptions.setDataBaseType("SQL SERVER");
+					querystr = querystr.toUpperCase().replaceAll("SQL SERVER", "");
+				}
 				querys = querystr.trim().split(" ");
 				list = Arrays.asList(querys);
 			}
 			//遍历 list
 			for (String ss : list) {
 				ss = ss.trim();
-				alllist.add(ss);
+				if (!"".equals(ss)) {
+					alllist.add(ss);
+				}
 			}
 			for (String ss : alllist) {
 				Matcher matcher2 = pattern.matcher(ss);