党员活动关系表增加userId字段,解决党员信息删除后无法查看原有的活动
3个文件已修改
14 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
@@ -69,6 +69,9 @@
            "AND t.create_at BETWEEN #{comActMessageVO.publishAtBegin} \n" +
            "AND #{comActMessageVO.publishAtEnd} \n" +
            " </if> " +
            "<if test='comActMessageVO.type != null and comActMessageVO.type !=0'>" +
            " AND t.type=#{comActMessageVO.type} \n" +
            " </if> " +
            " order by create_at desc"+
            "</script>")
    IPage<PageComActMessageVO> pageMyCommunityMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityMemberDO.java
@@ -34,6 +34,11 @@
    private Long memberId;
    /**
     * 用户ID
     */
    private Long userId;
    /**
     * 报名时间
     */
    @TableField(fill = FieldFill.INSERT)
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -280,11 +280,11 @@
    @Override
    public R listActivity(Long userId, Long communityId) {
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        Long memberId=comPbActivityMemberDAO.selectMemberIdByUserId(userId,communityId);
        /*Long memberId=comPbActivityMemberDAO.selectMemberIdByUserId(userId,communityId);
        if (ObjectUtils.isEmpty(memberId)) {
            return R.fail();
        }
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, memberId));
        }*/
        List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comPbActivityMemberDOS)) {
            return R.fail();
        }