From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 3694def..6944147 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -456,8 +456,10 @@
String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
infoUser.setUaid(uniqueId);
+
+ Boolean same = false;
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
- zInfoUserService.setUaidSame(user.getPhonenumber(),user.getUserName(),uniqueId);
+ same = zInfoUserService.setUaidSame(user.getPhonenumber(), user.getUserName(), uniqueId);
}
// 鎬у埆鏍煎紡杞崲锛圫tring 鈫� Integer锛�
infoUser.setSex(userAll.getSex().equals("0") ? 0 : 1);
@@ -533,6 +535,12 @@
infoUser.setRoleId(3L); // 璁剧疆瀹跺涵瑙掕壊ID
zInfoUserService.save(infoUser); // 淇濆瓨瀹跺涵鎵╁睍淇℃伅
+ if(same){
+ zInfoUserService.setUserInfoSame(infoUser);
+ marrySelfService.setMarryInfoSame(infoUser,marrySelf.getId());
+
+ }
+
// 5.5.1 鏇存柊閰嶅伓鍏宠仈淇℃伅
if (userAll.getSpouseId() != null) {
ZInfoUser zu = new ZInfoUser();
--
Gitblit v1.9.1