From 5003922498b3780660217ef2c77c50b836e166a3 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 26 Jan 2021 18:32:23 +0800 Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new --- src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java index 23d1783..5a9e4c0 100644 --- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java @@ -182,8 +182,8 @@ for(int i = 0;i < length;i++) { String string = split[i]; FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string)); - labelsName = selectById.getLabels(); - labelsName += (labelsName + ","); + String labelsNames = selectById.getLabels(); + labelsName += (labelsNames + ","); } FollowTraderProfitInfoVo.setLabels(labelsName); } @@ -194,7 +194,7 @@ } public static void main(String[] args) { - String labels = ""; + String labels = "1,2,3"; if(StrUtil.isNotEmpty(labels)) { String labelsName = ""; String[] split = labels.split(","); @@ -784,16 +784,15 @@ String labels = followTraderInfoEntity.getLabels(); if(StrUtil.isNotEmpty(labels)) { - String labelsName = ""; + ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>(); String[] split = labels.split(","); int length = split.length; for(int i = 0;i < length;i++) { String string = split[i]; FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string)); - labelsName = selectById.getLabels(); - labelsName += (labelsName + ","); + arrayList.add(selectById); } - tradeSetInfoVo.setLabels(labelsName); + tradeSetInfoVo.setFollowTraderLabelEntitys(arrayList); } return Result.ok(tradeSetInfoVo); } -- Gitblit v1.9.1