--no commit message

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

@@ -126,7 +126,9 @@ public class ThriceAuditServiceImpl extends BaseServiceImpl<ThriceAudit, Integer
                     return arg;
                 })
                 .collect(Collectors.toList());
-        List<ThriceAuditListVo> result = result1.stream().sorted(Comparator.comparing(ThriceAuditListVo::getDealTime).reversed()).collect(Collectors.toList());
+        List<ThriceAuditListVo> result = result1.stream().filter(v -> v.getDealTime() != null).sorted(Comparator.comparing(ThriceAuditListVo::getDealTime).reversed()).collect(Collectors.toList());
+        List<ThriceAuditListVo> vos = result1.stream().filter(v -> v.getDealTime() == null).collect(Collectors.toList());
+        result.addAll(vos);
         PageInfo info = new PageInfo();
         List<ThriceAuditListVo> vs = new ArrayList<ThriceAuditListVo>();
         //分页总个数