From 8dae8694c217a433946bf60d4ad67d423c611e3e Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Mon, 19 Mar 2018 21:51:05 +0800
Subject: [PATCH] merge

---
 boot-service/src/main/java/com/xwbing/demo/Ademo.java      | 7 +++----
 .../com/xwbing/service/sys/SysUserLoginInOutService.java   | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/demo/Ademo.java b/boot-service/src/main/java/com/xwbing/demo/Ademo.java
index 440cd02..d1f4550 100644
--- a/boot-service/src/main/java/com/xwbing/demo/Ademo.java
+++ b/boot-service/src/main/java/com/xwbing/demo/Ademo.java
@@ -8,10 +8,9 @@ package com.xwbing.demo;
  */
 public class Ademo {
     public static void main(String[] args) {
-        String a="aaaaa";
-        String b="bbbbb";
-        String aa = aa(a);
-        System.out.println(aa);
+      double a=10;
+      a=a+a*0.2;
+        System.out.println(a);
 
     }
     public static String aa(String aa){
diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java
index 7ce5a21..d7c3e55 100644
--- a/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java
+++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java
@@ -61,12 +61,12 @@ public class SysUserLoginInOutService {
         List<SysUserLoginInOut> list = loginInOutRepository.getByInoutType(inout);
         if (CollectionUtils.isNotEmpty(list)) {
             if (MapUtils.isNotEmpty(userMap)) {
-                list.forEach(inOut -> {
+                list=list.stream().sorted((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime())).peek(inOut -> {
                     inOut.setUserIdName(userMap.get(inOut.getUserId()).getName());//用户姓名
                     inOut.setRecordTime(DateUtil2.dateToStr(inOut.getCreateTime(), DateUtil2.YYYY_MM_DD_HH_MM_SS));//记录时间
                     CommonEnum.LoginInOutEnum inOutEnum = Arrays.stream(CommonEnum.LoginInOutEnum.values()).filter(obj -> obj.getValue() == inout).findFirst().get();//登录登出
                     inOut.setInoutTypeName(inOutEnum.getName());
-                });
+                }).collect(Collectors.toList());
             }
         }
         return list;