Merge branch 'dev_gml'

@@ -235,7 +235,7 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
 				return response;
 			}
 			listMaliciousIp = (List<MaliciousIp>) JSON.parseArray(ips_json, MaliciousIp.class);
-			List<MaliciousIp> newlistMaliciousIp = new ArrayList<MaliciousIp>();
+			/*List<MaliciousIp> newlistMaliciousIp = new ArrayList<MaliciousIp>();
 			if(CollectionUtils.isNotEmpty(listMaliciousIp)){
 				SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				Date date;
@@ -267,10 +267,14 @@ public class MaliciousIpServiceImpl implements MaliciousIpService {
 			        
 			        newlistMaliciousIp.add(maliciousIp);
 				}
-			}
+			}*/
 			Comparator comp = new ComparatorIp();
-			Collections.sort(newlistMaliciousIp, comp);
-			response.setData(newlistMaliciousIp);
+			/*Collections.sort(newlistMaliciousIp, comp);
+			response.setData(newlistMaliciousIp);*/
+
+			Collections.sort(listMaliciousIp, comp);
+			response.setData(listMaliciousIp);
+
 		}catch(Exception e){
 			logger.error(" - MaliciousIpServiceImpl - getIps - error", e);
 		}