From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index b6e3cbc..5d8542e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -25,6 +25,7 @@
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -187,9 +188,11 @@
//
//
// zInfoUser.setUserId(infoBysysId.getUserId());
+ user.setNickName(zInfoUser.getNickName());
user.setSex(zInfoUser.getSex()+"");
user.setUserName(zInfoUser.getOldName());
user.setPhonenumber(zInfoUser.getPhoneNumber());
+ user.setEmail(zInfoUser.getEmail());
String oriUaid = zInfoUser.getUaid();
String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
@@ -207,14 +210,37 @@
userService.updateUser(user);
//LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
-
- System.out.println("{{{{{{{"+oriUaid);
- System.out.println("{{{{{{{"+zInfoUser);
//淇敼uaid鐩稿悓鐨勭敤鎴疯褰�
if(oriUaid!=null) {
List<ZInfoUser> list = zInfoUserService.findByUaidToFaid(oriUaid);
- for(ZInfoUser zInfoUser1: list)
- zInfoUser1.setUaid(uniqueId);
+
+
+ for (int i = 0; i < list.size(); i++) {
+ ZInfoUser oldUser = list.get(i);
+
+ ZInfoUser newUser = new ZInfoUser();
+ // 鎷疯礉鎵�鏈夊睘鎬�
+ BeanUtils.copyProperties(zInfoUser, newUser);
+
+ newUser.setUserId(oldUser.getUserId());
+ newUser.setSysId(oldUser.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);
+
+ list.set(i,newUser);
+ if(!newUser.getUserId().equals(zInfoUser.getUserId())){
+ user.setNickName(null);
+ user.setUserId(oldUser.getSysId());
+ userService.updateUser(user);
+ }
+ }
return toAjax(zInfoUserService.updateBatchById(list));
}
else
--
Gitblit v1.9.1