From b10524103480a6834a2e8d5662f009c745143cc4 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 26 十二月 2025 09:22:31 +0800
Subject: [PATCH] 个人信息 修改时 新增一个最新更新时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 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 b6e3cbc..737459e 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;
@@ -128,6 +129,7 @@
ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
if(zInfoUser!=null)
{
+ zInfoUser.setUpdateTime(zInfoUser.getUpdateTime()==null?zInfoUser.getCreateTime():zInfoUser.getUpdateTime());
return AjaxResult.success(zInfoUser);
}
else
@@ -141,7 +143,10 @@
//鏌ヨsys_user琛�
// SysUser sysUser = sysUserService.selectUserById(userId);
- return AjaxResult.success(zInfoUserService.getInfoById(userId));
+ ZInfoUser infoById = zInfoUserService.getInfoById(userId);
+ if (infoById != null) infoById.setUpdateTime(infoById.getUpdateTime()==null?infoById.getCreateTime():infoById.getUpdateTime());
+
+ return AjaxResult.success(infoById);
}
//
@@ -175,6 +180,7 @@
// if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
// throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
// }
+ Date currentDate = new Date();
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
zInfoUser.setSysId(userId);
@@ -187,14 +193,19 @@
//
//
// zInfoUser.setUserId(infoBysysId.getUserId());
+ user.setNickName(zInfoUser.getNickName());
user.setSex(zInfoUser.getSex()+"");
user.setUserName(zInfoUser.getOldName());
user.setPhonenumber(zInfoUser.getPhoneNumber());
+ user.setEmail(zInfoUser.getEmail());
+ user.setUpdateTime(zInfoUser.getUpdateTime()!=null?zInfoUser.getUpdateTime():currentDate);
+
String oriUaid = zInfoUser.getUaid();
String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
zInfoUser.setUaid(uniqueId);
+
//
// us.setUserId(user.getSysId());
@@ -207,14 +218,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
@@ -461,4 +495,4 @@
return zInfoUserService.findUserNameAClan(strings1);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1