From a2e4f4e2aad027c72799588ec2a4deac73779e17 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 27 八月 2023 19:43:44 +0800
Subject: [PATCH] 815646
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 b4c060e..279e37a 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
@@ -444,6 +444,20 @@
}
}
+ if(genealogy.getPhoneNumber()!=null){
+ if(data.getPhoneNumber()!=genealogy.getPhoneNumber()){
+ it.remove();
+ continue;
+ }
+ }
+
+ if(genealogy.getUnit()!=null){
+ if(data.getUnit()!=genealogy.getUnit()){
+ it.remove();
+ continue;
+ }
+ }
+
if(genealogy.getBirth()!=null){
if(data.getBirth().compareTo(genealogy.getBirth())!=0){
it.remove();
--
Gitblit v1.9.1