From 043816358a40b094f8aa7493703a961190bbfa64 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 23 八月 2025 22:16:24 +0800
Subject: [PATCH] 同一用户 个人简历 修改时 同步修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 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 b983253..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
@@ -13,10 +13,8 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.ShareMore;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfDoctor;
-import com.ruoyi.domain.ZfRelation;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.Genealogy;
import com.ruoyi.domain.dto.GenealogyExportDto;
@@ -27,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;
@@ -161,8 +160,12 @@
Long userId = user.getUserId();
zInfoUser.setSysId(userId);
+
+
LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+
+
return toAjax(zInfoUserService.update(uw));
// saveOrUpdate(zInfoUser));
}
@@ -177,11 +180,24 @@
Long userId = user.getUserId();
zInfoUser.setSysId(userId);
+ Long userId1 = zInfoUserService.getInfoBysysId(userId).getUserId();
+ zInfoUser.setUserId(userId1);
+// ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(userId);
+//
+//
+// zInfoUser.setUserId(infoBysysId.getUserId());
+ user.setNickName(zInfoUser.getNickName());
user.setSex(zInfoUser.getSex()+"");
user.setUserName(zInfoUser.getOldName());
user.setPhonenumber(zInfoUser.getPhoneNumber());
+ String oriUaid = zInfoUser.getUaid();
+
+ String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ zInfoUser.setUaid(uniqueId);
+
//
// us.setUserId(user.getSysId());
// us.setUserName(user.getUserName());
@@ -192,8 +208,43 @@
// us.setRemark(user.getRemark());
userService.updateUser(user);
//LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
+
+ //淇敼uaid鐩稿悓鐨勭敤鎴疯褰�
+ if(oriUaid!=null) {
+ List<ZInfoUser> list = zInfoUserService.findByUaidToFaid(oriUaid);
+
+
+ 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
// uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
- return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+ return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
// saveOrUpdate(zInfoUser));
}
@@ -305,9 +356,7 @@
List<HashMap<Long,String>> satisfyIds = new ArrayList<>();
HashMap<Long,String> bs = new HashMap<>();
for (ZInfoUser zInfoUser:zInfoUsers) {
- if (zInfoUser.getMaritalStatus() ==null || zInfoUser.getMaritalStatus() != 1 )
bs.put(zInfoUser.getUserId(),zInfoUser.getNickName());
-
}
satisfyIds.add(bs);
return AjaxResult.success(satisfyIds);
--
Gitblit v1.9.1