huanghongfa
2021-05-07 b15fb40b3a9a7b92637e45ca3aae660b1c08a713
修改邻里圈后台发布的名字为null问题
5个文件已修改
57 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -83,4 +83,15 @@
    @ApiModelProperty("是否已经点赞 1 是 2 否")
    private Integer haveSign;
    /**
     * 发布类型(1.小程序发布  2.后台发布)
     */
    @ApiModelProperty("发布类型(1.小程序发布  2.后台发布)")
    private Integer type;
    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -61,4 +61,16 @@
    @ApiModelProperty("是否已经点赞 1 是 2 否")
    private Integer haveSign;
    /**
     * 发布类型(1.小程序发布  2.后台发布)
     */
    @ApiModelProperty("发布类型(1.小程序发布  2.后台发布)")
    private Integer type;
    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -40,6 +40,7 @@
            "canc.last_fabulous_num," +
            "canc.last_views_num," +
            "su.nick_name as name," +
            "su.community_id," +
            "su.image_url as headUrl " +
            " FROM " +
            " com_act_neighbor_circle AS canc" +
@@ -60,7 +61,7 @@
    @Select("<script> " +
            "select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content " +
            ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num " +
            ",canc.is_boutique,canc.create_at,canc.reply_at from com_act_neighbor_circle as canc " +
            ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type from com_act_neighbor_circle as canc " +
            " left join sys_user as su on su.user_id = canc.release_id where id = #{circleId}"+
            " </script>")
    ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
@@ -112,6 +112,11 @@
    private Integer lastViewsNum;
    /**
     * 发布类型(1.小程序发布  2.后台发布)
     */
    private Integer type;
    /**
     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
     */
    public interface status{
@@ -121,6 +126,14 @@
        int bh = 4;
    }
    /**
     * 发布类型(1.小程序发布  2.后台发布)
     */
    public interface type{
        int mini = 1;
        int admin = 2;
    }
    @Override
    public String toString() {
        return "ComActNeighborCircleDO{" +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -69,6 +69,8 @@
    private ComActNeighborCircleFabulousDAO comActNeighborCircleFabulousDAO;
    @Resource
    private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO;
    @Resource
    private ComActDAO comActDAO;
    /**
     * 分页查询邻里圈列表
@@ -92,6 +94,14 @@
                }else{
                    circleAppVO.setHaveSign(2);
                }
                if(circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
                    ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                    if(actDO != null){
                        circleAppVO.setName(actDO.getName());
                    }
                }
            }
        }
        return R.ok(doPager);
@@ -135,6 +145,13 @@
        ComActNeighborCircleDetailAppVO circleDetailAppVO = this.baseMapper.neighborDetailByApp(neighborCircleAppDTO.getCircleId());
        if(circleDetailAppVO == null){
            return R.fail("未找到邻里圈信息");
        }
        if(circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
            ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId());
            if(actDO != null){
                circleDetailAppVO.setName(actDO.getName());
            }
        }
        //查询邻里圈点赞信息
@@ -221,6 +238,7 @@
        comActNeighborCircleDO.setCommunityId(adminUser.getCommunityId());
        comActNeighborCircleDO.setReleaseContent(addVO.getReleaseContent());
        comActNeighborCircleDO.setReleaseImages(addVO.getReleaseImages());
        comActNeighborCircleDO.setType(2);
        comActNeighborCircleDO.setStatus(1);
        comActNeighborCircleDO.setCommentNum(0);
        comActNeighborCircleDO.setFabulousNum(0);