--no commit message

com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/thriceaudit/ThriceAuditServiceImpl.java

@@ -122,24 +122,27 @@ public class ThriceAuditServiceImpl extends BaseServiceImpl<ThriceAudit, Integer
                         arg.setAuditor(auditLog.getAuditor());
                         arg.setAuditorName(auditLog.getAuditorName());
                         arg.setDealTime(auditLog.getDealTime());
+                        if(arg.getDealTime() == null){
+                            arg.setDealTime(arg.getCreateTime());
+                        }else{
+                            arg.setDealTime(auditLog.getDealTime());
+                        }
                     }
                     return arg;
                 })
                 .collect(Collectors.toList());
-        List<ThriceAuditListVo> vos = result1.stream().filter(v -> v.getDealTime() == null).sorted(Comparator.comparing(ThriceAuditListVo::getCreateTime).reversed()).collect(Collectors.toList());
-        List<ThriceAuditListVo> result = result1.stream().filter(v -> v.getDealTime() != null).sorted(Comparator.comparing(ThriceAuditListVo::getDealTime).reversed()).collect(Collectors.toList());
-        vos.addAll(result);
+        List<ThriceAuditListVo> result = result1.stream().sorted(Comparator.comparing(ThriceAuditListVo::getDealTime).reversed()).collect(Collectors.toList());
         PageInfo info = new PageInfo();
         List<ThriceAuditListVo> vs = new ArrayList<ThriceAuditListVo>();
         //分页总个数
-        info.setTotal(vos.size());
+        info.setTotal(result.size());
         //判断分页的前页列表
-        if ((pageParam.getPageNum() - 1) * pageParam.getPageSize() > vos.size()){
+        if ((pageParam.getPageNum() - 1) * pageParam.getPageSize() > result.size()){
             vs = null;
-        }else if ((pageParam.getPageNum() - 1) * pageParam.getPageSize() + pageParam.getPageSize() >= vos.size()){
-            vs = vos.subList((pageParam.getPageNum() - 1) * pageParam.getPageSize(), vos.size());
+        }else if ((pageParam.getPageNum() - 1) * pageParam.getPageSize() + pageParam.getPageSize() >= result.size()){
+            vs = result.subList((pageParam.getPageNum() - 1) * pageParam.getPageSize(), result.size());
         }else {
-            vs = vos.subList((pageParam.getPageNum() - 1) * pageParam.getPageSize(), (pageParam.getPageNum() - 1) * pageParam.getPageSize() + pageParam.getPageSize());
+            vs = result.subList((pageParam.getPageNum() - 1) * pageParam.getPageSize(), (pageParam.getPageNum() - 1) * pageParam.getPageSize() + pageParam.getPageSize());
         }
         info.setList(vs);
         return info;