From ee02f5032743f3c0bd217cb6cf8ba03ee663c629 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 10:16:31 +0800
Subject: [PATCH] 修改PeopleSea.java文件

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 52 insertions(+), 1 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 38f984b..ca4fbae 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
@@ -23,6 +23,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.crypto.spec.PSource;
 import java.util.*;
 import java.util.stream.Collectors;
 /**
@@ -57,14 +58,48 @@
 
     /** 浣跨浉鍚岀敤鎴峰悕+鐢佃瘽鍙风爜鐩稿悓鐨勭敤鎴峰搴旂殑uaid鍚屾*/
     @Override
-    public void setUaidSame(String phone, String username,String uniqueId){
+    public Boolean setUaidSame(String phone, String username,String uniqueId){
         UpdateWrapper<ZInfoUser> wrapper = new UpdateWrapper<>();
         wrapper.eq(phone!=null,"phone_number", phone)
                 .eq(username!=null,"old_name",username)
                 .set("uaid",uniqueId );
         this.update(null, wrapper); // 鎵ц鏇存柊
+
+        return true;
     }
 
+    /** 浣跨浉鍚岀敤鎴峰悕+鐢佃瘽鍙风爜鐩稿悓鐨勭敤鎴峰搴旂殑inforuser琛ㄥ悓姝�*/
+    @Override
+    public void setUserInfoSame(ZInfoUser zInfoUser){
+
+        ZInfoUser zInfoUser1 = new ZInfoUser();
+        zInfoUser1.setPhoneNumber(zInfoUser.getPhoneNumber());
+        zInfoUser1.setOldName(zInfoUser.getOldName());
+        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser1);
+        if (list(lqw).size() != 0){
+            ZInfoUser newUser = new ZInfoUser();
+            // 鎷疯礉鎵�鏈夊睘鎬�
+            BeanUtils.copyProperties(list(lqw).get(0), newUser);
+
+            newUser.setUserId(zInfoUser.getUserId());
+            newUser.setSysId(zInfoUser.getSysId());
+            newUser.setFamilyId(null);
+            newUser.setFatherId(null);
+            newUser.setMomId(null);
+            newUser.setUrl(null);
+            newUser.setSpouseId(null);
+            newUser.setIsMyFamily(null);
+            newUser.setCreateTime(null);
+            newUser.setClanId(null);
+            newUser.setNickName(null);
+
+            System.out.println("ddddd"+newUser);
+
+
+            this.updateById(newUser);
+        }
+
+    }
 
 
     @Override
@@ -196,6 +231,7 @@
     private LambdaQueryWrapper<ZInfoUser> buildCondition(ZInfoUser zInfoUser) {
 
         LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(zInfoUser.getSysId()!=null, ZInfoUser::getSysId, zInfoUser.getSysId());
         lqw.eq(zInfoUser.getUserId() != null, ZInfoUser::getUserId, zInfoUser.getUserId());
         lqw.like(StringUtils.isNotEmpty(zInfoUser.getAlwaysAddress()), ZInfoUser::getAlwaysAddress, zInfoUser.getAlwaysAddress());
         lqw.like(StringUtils.isNotEmpty(zInfoUser.getAlwaysPolice()), ZInfoUser::getAlwaysPolice, zInfoUser.getAlwaysPolice());
@@ -231,6 +267,21 @@
     }
 
     @Override
+    public ZInfoUser selectByUaidAndUid(ZInfoUser zInfoUser) {
+        LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        System.out.println(zInfoUser.getUserId());
+        System.out.println(zInfoUser.getUaid());
+        lambdaQueryWrapper.eq(!StringUtils.isEmpty(zInfoUser.getUaid()), ZInfoUser::getUaid, zInfoUser.getUaid())
+                .ne(zInfoUser.getSysId()!=null, ZInfoUser::getSysId, zInfoUser.getSysId());
+
+        List<ZInfoUser> lis = list(lambdaQueryWrapper);
+        if(!lis.isEmpty())
+            return lis.get(0);
+        else
+            return null;
+    }
+
+    @Override
     public AjaxResult removeByUserName(List<String> userName) {
         LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
         lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0)));

--
Gitblit v1.9.1