springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java
@@ -24,12 +24,15 @@ @ApiModelProperty("发布人") private String releaseName; @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台",hidden = true) private Integer userType; @ApiModelProperty("发布人电话") private String releasePhone; @ApiModelProperty("社区") private Long communityName; private String communityName; @ApiModelProperty("详情") private String releaseContent; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -66,10 +66,12 @@ @Select("<script> \n"+ "SELECT\n" + "nc.*,\n" + "u.`name` AS releaseName \n" + "u.`name` AS releaseName,u.`type` as userType\n" + ",ca.name as communityName\n" + "FROM\n" + "com_act_neighbor_circle nc\n" + "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" + "left join com_act ca on u.community_id=ca.community_id \n" + "<where>"+ "nc.community_id = #{neighborCircleAdminDTO.communityId} \n"+ "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>" + @@ -79,7 +81,9 @@ "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} \n" + " </if> " + "</where>"+ "order by nc.`status` asc,nc.create_at desc " + "order by " + "case when nc.`status`=1 then 0 else 1 end, \n" + "nc.`status` asc,nc.create_at desc " + "</script>") IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -188,6 +188,11 @@ public R pageNeighborByAdmin(ComActNeighborCircleAdminDTO neighborCircleAdminDTO) { Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize()); IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO); doPager.getRecords().forEach(data->{ if(data.getUserType()!=1){ data.setReleaseName(data.getCommunityName()); } }); return R.ok(doPager); } @@ -454,9 +459,9 @@ //邻里圈浏览器记录 neighborCircleBrowseDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleBrowseDO>() .eq(ComActNeighborCircleBrowseDO::getNeighborId, id)); //邻里圈点赞删除 需要一层一层删 /* neighborCircleFabulousDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleFabulousDO>() .eq(ComActNeighborCircleFabulousDO::get))*/ //邻里圈点赞删除 neighborCircleFabulousDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleFabulousDO>() .eq(ComActNeighborCircleFabulousDO::getCircleId,id)); return R.ok(); }