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