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 addMembers(@RequestParam("id") Integer id, @RequestParam("familyid") String familyid) { - personService.updatePersonFamilyId(id, familyid); + public CommonResult 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() .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() .eq(PersonDO::getId, id) + .set(PersonDO::getFamilyrelation, null) .set(PersonDO::getFamilyid, null)); }