From ec4733f0c90a88f2266731d16c94e6e2fada7528 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 22:46:45 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 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..9ab3ed7 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;
@@ -163,6 +161,7 @@
LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+
return toAjax(zInfoUserService.update(uw));
// saveOrUpdate(zInfoUser));
}
@@ -177,11 +176,19 @@
Long userId = user.getUserId();
zInfoUser.setSysId(userId);
-
-
+// ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(userId);
+//
+//
+// zInfoUser.setUserId(infoBysysId.getUserId());
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 +199,18 @@
// us.setRemark(user.getRemark());
userService.updateUser(user);
//LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
+
+
+ //淇敼uaid鐩稿悓鐨勭敤鎴疯褰�
+ if(oriUaid!=null) {
+ List<ZInfoUser> list = zInfoUserService.findByUaidToFaid(oriUaid);
+ for(ZInfoUser zInfoUser1: list)
+ zInfoUser1.setUaid(oriUaid);
+ return toAjax(zInfoUserService.saveBatch(list));
+ }
+ else
// uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
- return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+ return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
// saveOrUpdate(zInfoUser));
}
--
Gitblit v1.9.1