From cda6e4fd0c6ff94d01414e5cf85dc8b9cd7c4d0c Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 22 Nov 2016 15:25:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B8=8D=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=EF=BC=8C=E8=BE=93=E5=85=A5ORACLE?=
 =?UTF-8?q?=E3=80=81oracle=E3=80=81Oracle=E9=83=BD=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E8=AF=A2=E5=88=B0=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/service/impl/DataInfoServiceImp.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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);