From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 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 b983253..2941d4c 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));
     }
 
@@ -305,9 +322,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