修改族友圈没有自己的发布的问题，修改修改家族树成员和修改家族成员时，父辈与配偶不能为同一人

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyMemberController.java

@@ -140,6 +140,9 @@ public class TbFamilyMemberController extends BaseController {
         if (memberVo.getUserId().equals(memberVo.getSpouseUserId())) {
             return AjaxResult.error("配偶不能选自己");
         }
+        if (memberVo.getParentId().equals(memberVo.getSpouseUserId())) {
+            return AjaxResult.error("父辈与配偶不能为同一人");
+        }
         return toAjax(iTbFamilyMemberService.saveOrUpdate(memberVo) ? 1 : 0);
     }
 
@@ -180,6 +183,9 @@ public class TbFamilyMemberController extends BaseController {
         if (member.getMemberId().equals(member.getParentId())) {
             return AjaxResult.error("不能设置自己为父辈");
         }
+        if (member.getParentId().equals(member.getSpouseUserId())) {
+            return AjaxResult.error("父辈与配偶不能为同一人");
+        }
 
         if(!iTbFamilyMemberService.saveFamilyTree(member)){
             return AjaxResult.error("添加失败");

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

@@ -102,6 +102,9 @@ public class FamilyMemberController extends AppBaseController {
         if (member.getMemberId().equals(member.getParentId())) {
             return AjaxResult.error("不能设置自己为父辈");
         }
+        if (member.getParentId().equals(member.getSpouseUserId())) {
+            return AjaxResult.error("父辈与配偶不能为同一人");
+        }
         if(!memberService.saveFamilyTree(member)){
             return AjaxResult.error("添加失败");
         }

ruoyi-system/src/main/resources/mapper/app/TbMyPublishMapper.xml

@@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (select count(1)  from tb_publish_thumbs where publish_id = a.id)thumbs
             from (
                 select * from tb_my_publish p
+                where deleted = 'N' and app_user_id = #{appUserId}
+                union
+                select * from tb_my_publish p
                 where deleted = 'N' and app_user_id in (
                     select f.app_user_id uid from tb_my_friends f where friends_user_id = #{appUserId} and status = 2
                     union all