bugfixed: 78759 78537 78791

CeDo

2021-04-30 d66b069f8d609b9238efabd736b248f08dc8322c

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -8,8 +8,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_dangjian.dao.*;
@@ -52,7 +54,6 @@
    private ComPbDynDAO comPbDynDAO;
    @Resource
    private ComPbDynUserDAO comPbDynUserDAO;


    private final String REDIS_ORG_ALL="ogrlist";

@@ -352,24 +353,23 @@
     * @return 详情
     */
    @Override
    public R infoYnamic(Integer id) {
        ComPbDynDO comPbDynDO = comPbDynDAO.selectById(id);
        if (ObjectUtils.isEmpty(comPbDynDO)) {
    public R infoYnamic(Long id) {
        PartyBuildingComPbDynVO comPbDynVO = comPbDynDAO.selectVoById(id);
        if (ObjectUtils.isEmpty(comPbDynVO)) {
            return R.fail("动态不存在");
        }
        PartyBuildingComPbDynVO partyBuildingComPbDynVO=new PartyBuildingComPbDynVO();
        Long createBy = comPbDynDO.getCreateBy();
//        ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(createBy);
        String name = comPbMemberDAO.selectNameByUserId(createBy);
        if (ObjectUtils.isEmpty(name)) {
        //String name = comPbMemberDAO.selectNameByUserId(createBy);

        if (ObjectUtils.isEmpty(comPbDynVO.getCreateByName())) {
//            return R.fail("发布人不存在");
            String name = comPbMemberDAO.selectNameByUserId(comPbDynVO.getCreateBy());
            name="后台发布";
            comPbDynVO.setCreateByName(name);
        }
        Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
        BeanUtils.copyProperties(comPbDynDO,partyBuildingComPbDynVO);
        partyBuildingComPbDynVO.setCreateByName(name);
        partyBuildingComPbDynVO.setReadingVolume(null==integer?0:integer);
        return R.ok(partyBuildingComPbDynVO);
        //Integer integer = comPbDynUserDAO.selectCount(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId, id));
        comPbDynVO.setReadingVolume(null==comPbDynVO.getReadingVolume()?0:comPbDynVO.getReadingVolume());
        return R.ok(comPbDynVO);
    }

    /**
@@ -428,15 +428,11 @@
     */
    @Override
    public R addDynUser(ComPbDynUserVO comPbDynUserVO) {
        ComPbDynUserDO comPbDynUserDO = comPbDynUserDAO.selectOne(new QueryWrapper<ComPbDynUserDO>().lambda().eq(ComPbDynUserDO::getDynId,comPbDynUserVO.getDynId()).eq(ComPbDynUserDO::getUserId,comPbDynUserVO.getUserId()));
        if (ObjectUtils.isEmpty(comPbDynUserDO)) {
            comPbDynUserDO=new ComPbDynUserDO();
            BeanUtils.copyProperties(comPbDynUserVO,comPbDynUserDO);
            int insert = comPbDynUserDAO.insert(comPbDynUserDO);
            if (insert>0) {
                return R.ok();
            }
            return R.fail();
        ComPbDynUserDO comPbDynUserDO=new ComPbDynUserDO();
        BeanUtils.copyProperties(comPbDynUserVO,comPbDynUserDO);
        int insert = comPbDynUserDAO.insert(comPbDynUserDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }