diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index a5d170034..628e4b58f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -142,7 +142,7 @@ public class NcrTrackServiceImpl extends ServiceImpl for (NcrTrackVO trackVO : infoList) { String projectName = trackVO.getProjectName(); String yearName = trackVO.getYearName(); - String market = getMarket(targetMarketList, trackVO); + String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut()); String projectVersion = trackVO.getProjectVersion(); if(StringUtils.isNotBlank(projectVersion)){ trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion); @@ -296,7 +296,7 @@ public class NcrTrackServiceImpl extends ServiceImpl } } - private String getMarket(List targetMarketList, NcrTrackVO trackVO) { + private String getMarket(List targetMarketList, NcrTrackVO trackVO,String cut) { //目标市场 List dictModelList = new ArrayList<>(); for (String s : trackVO.getTargetMarket().split(",")) { @@ -308,7 +308,7 @@ public class NcrTrackServiceImpl extends ServiceImpl if(dictModelList.size() != 0){ StringBuilder sb = new StringBuilder(); for (DictModel dictModel : dictModelList) { - if(CutEnum.CN.getValue().equals(trackVO.getCut())){ + if(CutEnum.CN.getValue().equals(cut)){ sb.append(dictModel.getText()+","); }else{ sb.append(dictModel.getTextEn()+",");