Merge remote-tracking branch 'origin/master'

@@ -105,10 +105,8 @@ public class PgServiceImpl implements IPgService {
                 e.printStackTrace();
                 e.printStackTrace();
                 return result;
                 return result;
             }
             }
-            if (monitorList == null) {
-                return result;
-            } else {
-                //处理数据
+            if (monitorList != null && monitorList.size()>0) {
+            	//处理数据
                 List<Map<String, String>> list = Lists.newArrayList();
                 List<Map<String, String>> list = Lists.newArrayList();
                 Map<String, String> tmp = Maps.newHashMap();
                 Map<String, String> tmp = Maps.newHashMap();
                 Map<String, Object> map = monitorList.get(0);
                 Map<String, Object> map = monitorList.get(0);
@@ -138,6 +136,8 @@ public class PgServiceImpl implements IPgService {
                 }
                 }
                 result.put("data", list);
                 result.put("data", list);
                 return result;
                 return result;
+            } else {
+            	return result;
             }
             }
         }
         }
     }
     }