修改删除家族成员的问题，修改个人生平

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TPersonalPageController.java

@@ -207,14 +207,15 @@ public class TPersonalPageController extends BaseController {
      * @param userId
      * @return
      */
-    @GetMapping("/getCount/{userId}")
-    public AjaxResult getCountByUserID(@PathVariable("userId" ) Long userId) {
-        int count = iTPersonalPageService.count(new LambdaQueryWrapper<TPersonalPage>()
+    @GetMapping("/getByUid/{userId}")
+    public AjaxResult getByUserID(@PathVariable("userId" ) Long userId) {
+        // 获取最新添加的个人页
+        TPersonalPage page = iTPersonalPageService.getOne(new LambdaQueryWrapper<TPersonalPage>()
                 .eq(TPersonalPage::getStakeholderId, userId)
                 .eq(TPersonalPage::getEnable,"0")
+                .orderByDesc(TPersonalPage::getCreateTime)
+                .last("limit 1")
         );
-        AjaxResult result = AjaxResult.success();
-        result.put("count", count);
-        return result;
+        return AjaxResult.success(page);
     }
 }

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyMemberController.java

@@ -235,19 +235,24 @@ public class FamilyMemberController extends AppBaseController {
             return AjaxResult.error("删除失败，没有找到要删除的数据");
         }
         for (TbMemberMiddle item : middleList) {
+            if (item.getId().equals(middle.getId())) {
+                return AjaxResult.error("不能删除自己");
+            }
             if (item.getParentId() != null){
                 return AjaxResult.error("删除失败，成员已加入家族树");
             }
             if ("Y".equals(item.getPatriarch())){
-                return AjaxResult.error("删除失败，不能删除创建者");
+                return AjaxResult.error("不能删除创建者");
             }
             if ("N".equals(middle.getPatriarch())) {
                 if ("Y".equals(item.getAdmin())) {
-                    return AjaxResult.error("删除失败，不能删除管理员");
+                    return AjaxResult.error("不能删除管理员");
                 }
             }
         }
-        if(!middleService.removeByIds(Arrays.asList(ids))) {
+        if(!middleService.remove(new LambdaQueryWrapper<TbMemberMiddle>()
+                .eq(TbMemberMiddle::getFamilyId,familyId)
+                .in(TbMemberMiddle::getMemberId, Arrays.asList(ids)))) {
             return AjaxResult.error("删除失败");
         }
         return AjaxResult.success();

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -161,7 +161,9 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         if(ckPatriarch.intValue() > 0) {
             return AjaxResult.error("删除失败，不能删除创建者");
         }
-        if(!memberMiddleService.removeByIds(mids)) {
+        if(!memberMiddleService.remove(new LambdaQueryWrapper<TbMemberMiddle>()
+                .eq(TbMemberMiddle::getFamilyId,familyId)
+                .in(TbMemberMiddle::getMemberId, idList))) {
             return AjaxResult.error("删除失败");
         }
         return AjaxResult.success();