From fbfde8292c1ab06ccd943ef4c7acfe3c0e4101a1 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 19:42:56 +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 | 4 ++--
1 files changed, 2 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 46cac2b..68d4e81 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())){
--
Gitblit v1.9.1