From b705a1ea2c1a85a61831436c80744aea89d84e17 Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Fri, 13 Jun 2025 15:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/admin/person/PersonController.java      | 4 ++--
 .../yudao/module/system/service/person/PersonService.java     | 2 +-
 .../yudao/module/system/service/person/PersonServiceImpl.java | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/person/PersonController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/person/PersonController.java
index d81e4ab214..faab171746 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/person/PersonController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/person/PersonController.java
@@ -90,8 +90,8 @@ public class PersonController {
     @Operation(summary = "根据用户ID更新家庭组号")
     @Parameter(name = "id", description = "用户编号", required = true)
     @Parameter(name = "familyid", description = "家庭组号", required = true)
-    public CommonResult<Boolean> addMembers(@RequestParam("id") Integer id, @RequestParam("familyid") String familyid) {
-        personService.updatePersonFamilyId(id, familyid);
+    public CommonResult<Boolean> addMembers(@RequestParam("id") Integer id, @RequestParam("familyid") String familyid, @RequestParam("familyrelation") Integer familyrelation) {
+        personService.updatePersonFamilyId(id, familyid,familyrelation);
         return success(true);
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonService.java
index 90e0f45dd3..33b61c725c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonService.java
@@ -58,7 +58,7 @@ public interface PersonService {
      * @param id 用户编号
      * @param familyid 家庭组号
      */
-    void updatePersonFamilyId(Integer id, String familyid);
+    void updatePersonFamilyId(Integer id, String familyid,  Integer familyrelation);
 
     /**
      * 移除用户家庭组号
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonServiceImpl.java
index 4f454f5f42..95278ca525 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/person/PersonServiceImpl.java
@@ -73,12 +73,13 @@ public class PersonServiceImpl implements PersonService {
     }
 
     @Override
-    public void updatePersonFamilyId(Integer id, String familyid) {
+    public void updatePersonFamilyId(Integer id, String familyid,  Integer familyrelation) {
         // 校验存在
         validatePersonExists(id);
         // 更新
         personMapper.update(null, new LambdaUpdateWrapper<PersonDO>()
                 .eq(PersonDO::getId, id)
+                .set(PersonDO::getFamilyrelation, familyrelation)
                 .set(PersonDO::getFamilyid, familyid));
     }
 
@@ -89,6 +90,7 @@ public class PersonServiceImpl implements PersonService {
         // 更新
         personMapper.update(null, new LambdaUpdateWrapper<PersonDO>()
                 .eq(PersonDO::getId, id)
+                        .set(PersonDO::getFamilyrelation, null)
                 .set(PersonDO::getFamilyid, null));
     }