From f769e7c35bd1f8deb4f587ee9b019d633cecf8d6 Mon Sep 17 00:00:00 2001
From: zqy <252236926@qq.com>
Date: 星期五, 30 五月 2025 17:07:12 +0800
Subject: [PATCH] 修改用户
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 46cac2b..0e30d90 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
@@ -214,8 +214,8 @@
// infoUser.setFatherId(zfFamily.getFid());
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
-// Long myFamily = zInfoUserService.getById(user).getFamilyId();
-// if (myFamily != null) infoUser.setFamilyId(myFamily);
+ Long myFamily = zInfoUserService.getById(user).getFamilyId();
+ if (myFamily != null) infoUser.setFamilyId(myFamily);
if (user.getFid() != null){
//璺熼殢鐖朵翰鐨勫鏃忓拰瀹跺涵淇℃伅
// if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
@@ -253,8 +253,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());
// }
--
Gitblit v1.9.1