From 02d0c4d43358e3c034b3964d4cc30f9fed7cc843 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 19:43:03 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 2ef9345..112cc5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1561,11 +1561,9 @@
@PostMapping("/eldersauth/getMyfamilyElders/{userId}")
R<List<ComMngFamilyInfoVO>> getMyfamilyElders(@PathVariable("userId") Long userId){
List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(userId);
-
- List<ComMngFamilyInfoVO> sortedList = list.stream().sorted(Comparator.comparing(ComMngFamilyInfoVO::getCreateAt).reversed()).collect(Collectors.toList());
-
+
List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
- sortedList.forEach(rt -> {
+ list.forEach(rt -> {
int age = IdCard.IdNOToAge(rt.getIdCard());
boolean isElders = age >= 80;
if (isElders) {
--
Gitblit v1.7.1