From 808d34ab8f3b7ca311ea5c76942dbc7b915f58f7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 九月 2025 16:25:18 +0800
Subject: [PATCH] 百年心愿 试用期结束后 不允许修改删除等操作
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 2aada8a..07c2889 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
@@ -231,6 +231,18 @@
// 浼樺厛鑾峰彇褰撳墠鏁版嵁搴撹褰�
ZInfoUser byId = zInfoUserService.getById(user);
Long myFamily = byId.getFamilyId();
+
+ //鑾峰彇鍚屼竴鐢ㄦ埛鐨勪俊鎭� 骞跺鍏惰繘琛屼慨鏀�
+ zInfoUserService.findByUaidToFaid(byId.getUaid())
+ .stream()
+ .filter(infoUser1 -> !infoUser1.getUserId().equals(infoUser.getUserId()))
+ .forEach(infoUser1 -> {
+ infoUser1.setOldName(infoUser.getOldName());
+ infoUser1.setMaritalStatus(infoUser.getMaritalStatus());
+ infoUser1.setSex(infoUser.getSex());
+ zInfoUserService.updateById(infoUser1);
+ });
+
// 淇濈暀鍘熷搴璉D锛堢‘淇濇暟鎹繛缁�э級
if (myFamily != null) infoUser.setFamilyId(myFamily);
@@ -326,7 +338,10 @@
marrySelfService.updateData(spouse); // 鎸佷箙鍖�
}
- // 3.4 绂诲鐗规畩澶勭悊锛堢姸鎬佺爜=2锛�
+
+
+
+ // 3.4 绂诲鐗规畩澶勭悊锛堢姸鎬佺爜=2锛�
if(user.getMaritalStatus() != null && user.getMaritalStatus() == 2) {
// 3.4.1 鑾峰彇閰嶅伓淇℃伅
Long spouseId = zInfoUserService.getById(user.getUserId()).getSpouseId();
@@ -441,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);
@@ -518,6 +535,10 @@
infoUser.setRoleId(3L); // 璁剧疆瀹跺涵瑙掕壊ID
zInfoUserService.save(infoUser); // 淇濆瓨瀹跺涵鎵╁睍淇℃伅
+ if(same){
+ zInfoUserService.setUserInfoSame(infoUser);
+ }
+
// 5.5.1 鏇存柊閰嶅伓鍏宠仈淇℃伅
if (userAll.getSpouseId() != null) {
ZInfoUser zu = new ZInfoUser();
--
Gitblit v1.9.1