zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -596,12 +596,14 @@ } } if(genealogy.getBirth()!=null&&data.getBirth()!=null){ if(genealogy.getBirth()!=null){ if(data.getBirth()!=null) { if(data.getBirth().compareTo(genealogy.getBirth())!=0){ it.remove(); continue; } } else it.remove(); } } // System.out.println(resultData);