From 35924055a41e1505aceacef503fd3cfa7a064a36 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 26 八月 2025 20:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 447c550..3694def 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
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
+import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.MarryInfoDto;
import com.ruoyi.service.*;
@@ -219,6 +220,13 @@
infoUser.setSpouseId(user.getSpouseId());
}
+ String originalString=user.getUserName()+"-"+user.getPhonenumber();
+
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ infoUser.setUaid(uniqueId);
+ zInfoUserService.setUaidSame(user.getPhonenumber(),user.getUserName(),uniqueId);
+
+
// ----- 2.2 瀹舵棌鍏崇郴缁ф壙閫昏緫 -----
// 浼樺厛鑾峰彇褰撳墠鏁版嵁搴撹褰�
ZInfoUser byId = zInfoUserService.getById(user);
@@ -403,6 +411,7 @@
user.setRemark(userAll.getRemark()); // 澶囨敞淇℃伅
user.setUpdateBy(userAll.getUpdateBy()); // 鏇存柊浜�
user.setClanId(userAll.getClanId()); // 瀹舵棌ID
+ user.setPaid(userAll.getPaid());
// ===================== 2. 鍞竴鎬ф牎楠岋紙鐧诲綍鍚�/鎵嬫満鍙�/閭锛� =====================
// 2.1 鐧诲綍鍚嶆牎楠�
@@ -410,9 +419,10 @@
return error("鏂板鐢ㄦ埛'" + user.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
// 2.2 鎵嬫満鍙锋牎楠岋紙闈炵┖鏃堕獙璇侊級
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
+// else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+//
+// return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+// }
// 2.3 閭鏍￠獙锛堥潪绌烘椂楠岃瘉锛�
else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
@@ -441,6 +451,14 @@
infoUser.setNickName(userAll.getNickName()); // 褰撳墠鏄电О
infoUser.setOldName(userAll.getUserName()); // 鍘嗗彶鍚嶇О锛堜繚鐣欒褰曪級
infoUser.setPhoneNumber(userAll.getPhonenumber()); // 鑱旂郴鏂瑰紡
+
+ String originalString=userAll.getUserName()+"-"+userAll.getPhonenumber();
+
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ infoUser.setUaid(uniqueId);
+ if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+ zInfoUserService.setUaidSame(user.getPhonenumber(),user.getUserName(),uniqueId);
+ }
// 鎬у埆鏍煎紡杞崲锛圫tring 鈫� Integer锛�
infoUser.setSex(userAll.getSex().equals("0") ? 0 : 1);
infoUser.setSpouseId(userAll.getSpouseId()); // 閰嶅伓ID
--
Gitblit v1.9.1