Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-20 bb2da5de17a6d959f91738c17868b312ee14e86b

 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) {