[bug-6831]受控文件查询重写排序规则按照发布时间和文件编号排序

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/ReformServiceImpl.java

@@ -267,7 +267,15 @@ public class ReformServiceImpl implements ReformService {
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .collect(Collectors.toList());
-        Map<String, Object> map = paginate(mergedList, pageNo , limit);
+        List<Map<String, Object>> collect = mergedList.stream().sorted(Comparator.comparing(
+                (Map<String, Object> map) -> (String) map.get("fa_bu_shi_jian_"),
+                Comparator.nullsLast(Comparator.naturalOrder())
+                ).thenComparing(
+                map -> (String) map.get("wen_jian_bian_hao"),
+                Comparator.nullsLast(Comparator.naturalOrder())
+                )
+        ).collect(Collectors.toList());
+        Map<String, Object> map = paginate(collect, pageNo , limit);
         result.setVariables(map);
         return result;
     }