修改bug

huanghongfa

2021-05-28 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6

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

@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActEasyPhotoCommentDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoCommentUserDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
@@ -112,6 +113,9 @@
            }
        }
        comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone()));
        if(comActEasyPhotoVO.getAddrRemark()==null){
            comActEasyPhotoVO.setAddrRemark("");
        }
        return R.ok(comActEasyPhotoVO);
    }

@@ -253,8 +257,9 @@
                Long id = comActEasyPhotoVO1.getId();
                Integer status = comActEasyPhotoVO1.getStatus();
                Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
                ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
                if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
                List<ComActEasyPhotoUserDO> comActEasyPhotoUserDO =
                        comActEasyPhotoUserDAO.selectList(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
                if (comActEasyPhotoUserDO==null||comActEasyPhotoUserDO.size()==0) {
                    comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
                }else {
                    comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
@@ -288,6 +293,13 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActEasyPhotoCommentVO> iPage = comActEasyPhotoCommentDAO.pageComActEasyPhotoComment(page, pageComActEasyPhotoCommentDTO);
        if(!iPage.getRecords().isEmpty()){
            for (ComActEasyPhotoCommentVO commentVO:iPage.getRecords()) {
                if(StringUtils.isEmpty(commentVO.getName())){
                    commentVO.setName(commentVO.getNickName());
                }
            }
        }
        return R.ok(iPage);
    }