bug修复

huanghongfa

2021-08-23 b8129d34235cc9af66642d4a44bc68df2debd2ba

bug修复

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -529,6 +529,9 @@
            return R.fail("随手拍主键不能为空");
        }
        comActEasyPhotoVO.setUserId(userId);
        if(comActEasyPhotoVO.getHandlerId() == null){
            comActEasyPhotoVO.setHandlerId(userId);
        }
        R r = communityService.putEasypHotoStatus(comActEasyPhotoVO);
        if (R.isOk(r)) {
            R r1 = communityService.detailEasyPhoto(id, userId);

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java

@@ -71,7 +71,10 @@

        Date nowDate = new Date();
        //查询用户openid
        R userResult = userService.getUserOpenId(comOpsHouseVO.getUserId());
        R userResult = null;
        if(comOpsHouseVO.getUserId() != null){
            userResult = userService.getUserOpenId(comOpsHouseVO.getUserId());
        }
        if(R.isOk(r) && 1==comOpsHouseVO.getStatus()) {
            //审核通过添加提示信息
            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
@@ -90,7 +93,7 @@
                log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }

            if(R.isOk(userResult)){
            if(userResult != null && R.isOk(userResult)){
                String openid = userResult.getData().toString();
                WxXCXTempSend util = new WxXCXTempSend();
                try {
@@ -120,7 +123,7 @@
                log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }

            if(R.isOk(userResult)){
            if(userResult != null && R.isOk(userResult)){
                String openid = userResult.getData().toString();
                WxXCXTempSend util = new WxXCXTempSend();
                try {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java

@@ -29,7 +29,7 @@
    @Select("" +
            "SELECT\n" +
            "u.`name` userName,\n" +
            "u.`nick_name` userNickName,\n" +
            "IFNULL(u.`nick_name`,'社区管理员') as userNickName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "c.`comment`,\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java

@@ -150,7 +150,7 @@
            "select * from ("+
            "SELECT " +
            "u.`name` userName, " +
            "u.nick_name userNickName, " +
            "IFNULL(u.`nick_name`,'社区管理员') as userNickName, " +
            "u.`image_url`, " +
            "u.phone, " +
            "u.type as userType, " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -271,7 +271,7 @@
            "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id  " +
            "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
            " <where>" +
            " p.del_tag = 0 and p.is_publicity = 1 "  +
            " p.del_tag = 0 "  +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            " </if> " +
@@ -282,7 +282,7 @@
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
            "AND p.`status` in (2,4)  " +
            "AND p.`status` in (2,4) and p.is_publicity = 1 " +
            " </if> " +
            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java

@@ -450,9 +450,9 @@
                                comActDiscussCommentVO1.setHaveSign(0);
                            }
                        }
                        if(StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())){
                            comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
                        }
//                        if(StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())){
//                            comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
//                        }
                    });
                    comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList);
                }