修改新增成员失败的问题

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

@@ -201,4 +201,20 @@ public class TPersonalPageController extends BaseController {
         ajax.put("img", Base64.encode(os.toByteArray()));
         return ajax;
     }
+
+    /**
+     * 根据干系人id获取总数
+     * @param userId
+     * @return
+     */
+    @GetMapping("/getCount/{userId}")
+    public AjaxResult getCountByUserID(@PathVariable("userId" ) Long userId) {
+        int count = iTPersonalPageService.count(new LambdaQueryWrapper<TPersonalPage>()
+                .eq(TPersonalPage::getStakeholderId, userId)
+                .eq(TPersonalPage::getEnable,"0")
+        );
+        AjaxResult result = AjaxResult.success();
+        result.put("count", count);
+        return result;
+    }
 }

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

@@ -164,8 +164,8 @@ public class FamilyMemberController extends AppBaseController {
         if (org.apache.commons.lang3.StringUtils.isBlank(memberVo.getMobile())){
             return AjaxResult.error("手机号不能为空");
         }
-        // 后台添加，状态直接为通过 2
-        memberVo.setStatus("2");
+        // 申请 1
+        memberVo.setStatus("1");
         return toAjax(memberService.saveOrUpdate(memberVo) ? 1 : 0);
     }
 

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

@@ -61,7 +61,6 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
             return false;
         }
         AppMemberVo member = userService.getMember("member",null,memberVo.getMobile());
-        member.setMemberRemark(memberVo.getMemberRemark());
         if (member == null) {
             member = new AppMemberVo();
             BeanUtils.copyBeanProp(member, memberVo);
@@ -74,7 +73,9 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
             member.setState(memberVo.getState());
             member.setFamilyId(memberVo.getFamilyId());
         }
-
+        if (StringUtils.isNotBlank(memberVo.getMemberRemark())) {
+            member.setMemberRemark(memberVo.getMemberRemark());
+        }
         if (StringUtils.isBlank(member.getNickName())) {
             member.setNickName(member.getName());
         }