lidongdong
2023-06-28 53e20d47c18f4cedad5c1d314dfea28c27a6b1e1
修改三资公开地区街道id
7个文件已修改
20 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ActDynTypeApi.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenWorkApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -77,7 +77,7 @@
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            comActDynVO.setCommunityId(loginUserInfo.getCommunityId());
            comActDynVO.setCommunityId(loginUserInfo.getCommunityId()+"");
        }
        comActDynVO.setIsTopping(null);
        comActDynVO.setStatus(1);
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ActDynTypeApi.java
@@ -83,7 +83,7 @@
    @ApiOperation(value = "分页查询花城资讯", response = ComActDynVO.class)
    @PostMapping("/pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        comActDynVO.setCommunityId(0L);
        comActDynVO.setCommunityId("0");
        return communityService.pageDynamicByAdmin(comActDynVO);
    }
@@ -111,14 +111,14 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("花城资讯主键不能为空");
        }
        comActDynVO.setCommunityId(0L);
        comActDynVO.setCommunityId("0");
        return communityService.putDynamic(comActDynVO);
    }
    @ApiOperation(value = "新增花城资讯")
    @PostMapping("/dynamic")
    public R addDynamic(@RequestBody ComActDynVO comActDynVO) {
        comActDynVO.setCommunityId(0L);
        comActDynVO.setCommunityId("0");
        Date publishAt = comActDynVO.getPublishAt();
        if (null == publishAt) {
            publishAt = new Date();
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
@@ -52,7 +52,7 @@
    private Date updateAt;
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;
    private String communityId;
    @ApiModelProperty(value = "当前页数", example = "1")
    private Long pageNum;
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -708,7 +708,7 @@
    @PostMapping("dynamic")
    public R addDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        comActDynVO.setCommunityId(communityId+"");
        Date publishAt = comActDynVO.getPublishAt();
        if (null == publishAt) {
            publishAt = new Date();
@@ -730,7 +730,7 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
        comActDynVO.setCommunityId(communityId);
        comActDynVO.setCommunityId(communityId+"");
        return communityService.putDynamic(comActDynVO);
    }
@@ -750,7 +750,7 @@
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        if(loginUserInfoVO.getCommunityId()!=null && loginUserInfoVO.getCommunityId()>0 )
        {
            comActDynVO.setCommunityId(loginUserInfoVO.getCommunityId());
            comActDynVO.setCommunityId(loginUserInfoVO.getCommunityId()+"");
        }
        if(loginUserInfoVO.getStreetId()!=null && loginUserInfoVO.getStreetId()>0 )
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenWorkApi.java
@@ -271,7 +271,7 @@
        if (id == null) {
            return R.fail(401, "请先登录");
        }
        comActDynVO.setCommunityId(id);
        comActDynVO.setCommunityId(id+"");
        // if(comActDynVO.getCommunityId() == null){
        // return R.fail("参数错误");
        // }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -790,7 +790,6 @@
    /**
     * 分页查询随手拍  浪潮专用
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 心愿列表
     */
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
@@ -13,7 +13,6 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.SysUserDao;
import com.panzhihua.service_community.model.dos.ComActDO;