From 46913f8e05b8b6968f651a0d8cd4b94f726e47e2 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 20 六月 2025 22:35:20 +0800
Subject: [PATCH] 修改了uaid的bug，可以查看到数据了，不能看的就看不了了
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 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 6a4b3f0..3deb9dd 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,7 +13,9 @@
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.*;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysRoleMapper;
@@ -193,7 +195,7 @@
//System.out.println(sysUserRole.getRoleId());
System.out.println("浣犲ソ鍛�");
System.out.println(user.getRoleId());
- if (user.getRoleId().equals(102L)){
+ if (user.getRoleId() != null && user.getRoleId().equals(102L)){
ZInfoUser infoUser = new ZInfoUser();
infoUser.setUserId(user.getUserId());
infoUser.setOldName(user.getUserName());
@@ -201,7 +203,7 @@
infoUser.setIsMyFamily(user.getIsMyFamily());
infoUser.setMomId(user.getMid());
infoUser.setFatherId(user.getFid());
- infoUser.setSex(Integer.valueOf(user.getSex()));
+ if (user.getSex() != null)infoUser.setSex(Integer.valueOf(user.getSex()));
// infoUser.setFamilyId(user.getFamilyId());
infoUser.setSysId(user.getSysId());
@@ -214,7 +216,9 @@
// infoUser.setFatherId(zfFamily.getFid());
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
-
+ ZInfoUser byId = zInfoUserService.getById(user);
+ Long myFamily = byId.getFamilyId();
+ if (myFamily != null) infoUser.setFamilyId(myFamily);
if (user.getFid() != null){
//璺熼殢鐖朵翰鐨勫鏃忓拰瀹跺涵淇℃伅
// if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
@@ -241,7 +245,9 @@
// System.out.println("2222222222222222222222222222222222/");
// infoUser.setFamilyId(mother.getFamilyId());
// }
- if (user.getSpouseId() != null){
+ System.out.println("{{{{{{{{{{{{{{{"+user);
+
+ if (user.getSpouseId() != null ){
//璺熼殢閰嶅伓鐨勫鏃忓拰瀹跺涵淇℃伅
// if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
@@ -252,8 +258,10 @@
ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
System.out.println("33333333333333333333333333333333333333333/");
infoUser.setFamilyId(spouse.getFamilyId());
- infoUser.setFatherId(spouse.getFatherId());
- infoUser.setMomId(spouse.getMomId());
+ if(spouse.getFatherId() !=null || spouse.getMomId() !=null) {
+ infoUser.setFatherId(spouse.getFatherId());
+ infoUser.setMomId(spouse.getMomId());
+ }
infoUser.setClanId(spouse.getClanId());
// }
@@ -261,17 +269,19 @@
}
- if(infoUser.getFamilyId()!=null)
+ if(infoUser.getFamilyId() != null )
zInfoUserService.saveOrUpdate(infoUser);
else {
System.out.println("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
- return AjaxResult.success("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ return AjaxResult.error("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
}
//鏇存柊閰嶅伓淇℃伅
- if(user.getSpouseId()!=null) {
+ if(user.getSpouseId() != null) {
ZInfoUser zu = new ZInfoUser();
zu.setUserId(user.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
+ zu.setFatherId(infoUser.getFatherId());
+ zu.setMomId(infoUser.getMomId());
// Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId();
// Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId();
// zu.setMomId(spouseMoM);
@@ -281,7 +291,7 @@
//鏇存柊MarrySelf鍜孧arryUser
ZInfoUser zfi = zInfoUserService.getById(user.getUserId());
- MarrySelf marrySelf = new MarrySelf();
+ MarryInfoDto marrySelf = new MarryInfoDto();
marrySelf.setUid(user.getSpouseId());
marrySelf.setName(zfi.getOldName());
marrySelf.setSpouseSex(zfi.getSex()==1?"鐢�":"濂�");
@@ -290,7 +300,7 @@
marrySelf.setSpouseName(infoUser.getOldName());
marrySelf.setSpouseSex(infoUser.getSex()==1?"鐢�":"濂�");
marrySelf.setSpouseMarryStatus(0);
- marrySelfService.saveOrUpdate(marrySelf);
+ marrySelfService.updateData(marrySelf);
//澧炲姞MarryUser
//澧炲姞marryUser
MarryUser marryUser = new MarryUser();
@@ -306,7 +316,7 @@
}
else {
System.out.println("daniuni");
- return AjaxResult.success("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ return AjaxResult.error("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
}
// zInfoUserService.update(infoUser);
@@ -372,6 +382,19 @@
infoUser.setNickName(userAll.getNickName());
infoUser.setOldName(userAll.getUserName());
infoUser.setPhoneNumber(userAll.getPhonenumber());
+
+
+ //璁剧疆鏂扮殑usid
+// UUID uuid= UUID.fromString(userAll.getUserName()+userAll.getPhonenumber());
+// String usid = uuid.toString();
+
+
+ String originalString=userAll.getUserName()+"-"+userAll.getPhonenumber();
+
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ infoUser.setUaid(uniqueId);
+
+
System.out.println(userAll.getSex());
System.out.println("鎬у埆鐨勫師鍥�");
@@ -425,6 +448,7 @@
}
MarrySelf marrySelf = new MarrySelf();
+ marrySelf.setUid(user.getUserId());
marrySelf.setName(infoUser.getOldName());
marrySelf.setSex(infoUser.getSex()==1?"鐢�":"濂�");
marrySelf.setMarryStatus(0);
--
Gitblit v1.9.1