From 57233ad3b5bca82673aac7707712b959d2b40113 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 07 五月 2021 11:03:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test --- springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java index fd7c4b9..4a94dd7 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java @@ -206,7 +206,8 @@ */ @Override public R listPartyMember(Long communityId) { - List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId)); + List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda() + .eq(ComPbMemberDO::getCommunityId,communityId).eq(ComPbMemberDO::getAuditResult, 1)); // 查询社区所有已经注册的党员 // 排除掉已经成为党委的党员 // List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId); @@ -510,7 +511,9 @@ comPbMemberDO.setUpdateAt(new Date()); } if (comPbMemberDAO.updateById(comPbMemberDO) > 0) { - return R.ok(comPbMemberDO.getIdCard()); + PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO(); + BeanUtils.copyProperties(comPbMemberDO, rtVO); + return R.ok(rtVO); } return R.fail(); } -- Gitblit v1.7.1