合并代码

puzhibing

2024-10-29 756acd57d2aa9acaf91ad0eee3e41ebe0dea9a75

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java

@@ -129,8 +129,6 @@
                counts.forEach(count -> {
                    if (tag.getId().equals(count.getId())) {
                        tag.setTagCount(count.getTagCount());
                    }else{
                        tag.setTagCount(0);
                    }
                });
            }else{
@@ -389,9 +387,11 @@
            BeanUtils.copyProperties(orderEvaluate, orderEvaluateVo);
            List<TOrderEvaluateTag> tOrderEvaluateTags = orderEvaluateTagMapper.selectList(new LambdaQueryWrapper<TOrderEvaluateTag>().eq(TOrderEvaluateTag::getOrderEvaluateId, orderEvaluate.getId()));
            List<Integer> tagId = tOrderEvaluateTags.stream().map(TOrderEvaluateTag::getEvaluationTagId).collect(Collectors.toList());
            List<TEvaluationTag> data = evaluationTagClient.getListByIds(tagId).getData();
            List<String> collect = data.stream().map(TEvaluationTag::getName).collect(Collectors.toList());
            orderEvaluateVo.setTagName(collect);
            if(tagId.size() > 0){
                List<TEvaluationTag> data = evaluationTagClient.getListByIds(tagId).getData();
                List<String> collect = data.stream().map(TEvaluationTag::getName).collect(Collectors.toList());
                orderEvaluateVo.setTagName(collect);
            }
            return orderEvaluateVo;
        }
        return null;