From ef33492fa817c1a61589a25cc5a2721663f49e8c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 06 一月 2025 11:37:23 +0800
Subject: [PATCH] 添加了两个字段,已经修改了对应代码

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 97b8046..3d94165 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/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();
             }
         }
 

--
Gitblit v1.9.1