Merge branch 'txb'

tangxiaobao

2021-08-13 8a6375edade9f1edc194a0381369fe94e56c13c7

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

@@ -105,11 +105,11 @@
    @Override
    public R getIntegralCommunityTradeApplets(ComActIntegralCommunityRankDTO communityTradeDTO){
        if(communityTradeDTO.getType().equals(ComActIntegralCommunityRankDTO.type.resident)){
            communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.type.resident);
            communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.identityType.resident);
        }else if(communityTradeDTO.getType().equals(ComActIntegralCommunityRankDTO.type.party)){
            communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.type.party);
            communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.identityType.party);
        }else if(communityTradeDTO.getType().equals(ComActIntegralCommunityRankDTO.type.volunteer)){
            communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.type.volunteer);
            communityTradeDTO.setIdentityType(ComActIntegralCommunityRankDTO.identityType.volunteer);
        }
        return R.ok(this.baseMapper.getIntegralCommunityTradeApplets(new Page(communityTradeDTO.getPageNum(),communityTradeDTO.getPageSize()),communityTradeDTO));
    }
@@ -206,7 +206,7 @@
                    ComActDiscussDO discussDO = comActDiscussDAO.selectById(serviceId);
                    if(discussDO != null){
                        remark.append("【");
                        remark.append(discussDO.getVoteTitle());
                        remark.append(discussDO.getDiscussSubject());
                        remark.append("】");
                    }
                }else{