From 043816358a40b094f8aa7493703a961190bbfa64 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 23 八月 2025 22:16:24 +0800
Subject: [PATCH] 同一用户 个人简历 修改时 同步修改
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 35 ++++++++++++++++++++++++++++++-----
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java | 2 +-
5 files changed, 34 insertions(+), 9 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..025b517 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,6 +188,7 @@
//
//
// zInfoUser.setUserId(infoBysysId.getUserId());
+ user.setNickName(zInfoUser.getNickName());
user.setSex(zInfoUser.getSex()+"");
user.setUserName(zInfoUser.getOldName());
user.setPhonenumber(zInfoUser.getPhoneNumber());
@@ -207,14 +209,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
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java
index 9b37fb4..a8b6918 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthBaseServiceImpl.java
@@ -105,7 +105,7 @@
Long userId = user.getUserId();
- //鑾峰彇鍒板悓鎰忕敤鎴风殑sys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ //鑾峰彇鍒板悓涓�鐢ㄦ埛鐨剆ys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
String uaid = zInfoUser.getUaid();
List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
index 34e69a5..1c71eb5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
@@ -100,7 +100,7 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- //鑾峰彇鍒板悓鎰忕敤鎴风殑sys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ //鑾峰彇鍒板悓涓�鐢ㄦ埛鐨剆ys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
String uaid = zInfoUser.getUaid();
List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java
index 4809222..836799c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthInfoServiceImpl.java
@@ -102,7 +102,7 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- //鑾峰彇鍒板悓鎰忕敤鎴风殑sys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ //鑾峰彇鍒板悓涓�鐢ㄦ埛鐨剆ys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
String uaid = zInfoUser.getUaid();
List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java
index 0279101..2ea319a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthNowServiceImpl.java
@@ -107,7 +107,7 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- //鑾峰彇鍒板悓鎰忕敤鎴风殑sys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ //鑾峰彇鍒板悓涓�鐢ㄦ埛鐨剆ys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
String uaid = zInfoUser.getUaid();
List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
--
Gitblit v1.9.1