From 85f1069c987fe848da7e297da8a693119220f06f Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 16:39:38 +0800
Subject: [PATCH] bugfixed

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 4dea248..5a76c55 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
@@ -1546,8 +1546,9 @@
 
         List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
         sortedList.forEach(rt -> {
-            boolean isElders =  rt.getAge()>=80;
-            if(isElders){
+            int age = IdCard.IdNOToAge(rt.getIdCard());
+            boolean isElders = age >= 80;
+            if (isElders) {
                 listRt.add(rt);
             }
         });
@@ -1583,6 +1584,9 @@
             //根据身份证查询出籍贯 出生日期
             //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
             String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
+            if(StringUtils.isEmpty(domicile)){
+                domicile = "暂无";
+            }
 
             Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
             eldersAuthDO.setDomicile(domicile);

--
Gitblit v1.7.1