yonge пре 7 месеци
родитељ
комит
1bf5fdf1a6
1 измењених фајлова са 1 додато и 1 уклоњено
  1. 1 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2941,7 +2941,7 @@ public class ExportServiceImpl implements ExportService {
                 String goodsName = basicOrder.getGoodsList().stream().map(Goods::getName).collect(Collectors.joining("|"));
                 String goodsName = basicOrder.getGoodsList().stream().map(Goods::getName).collect(Collectors.joining("|"));
                 basicOrder.setMemo(goodsName);
                 basicOrder.setMemo(goodsName);
             }
             }
-            if (basicOrder.getType() == OUTORDER) {
+            if (basicOrder.getType() == OUTORDER || GroupType.OUTORDER == basicOrder.getGroupType()) {
             	if(StringUtils.isNotEmpty(basicOrder.getMusicGroupId())) {
             	if(StringUtils.isNotEmpty(basicOrder.getMusicGroupId())) {
                     if (cooperationOrganMap.containsKey(basicOrder.getMusicGroupId())) {
                     if (cooperationOrganMap.containsKey(basicOrder.getMusicGroupId())) {
                         basicOrder.setCooperationOrganName(cooperationOrganMap.get(basicOrder.getMusicGroupId()).getName());
                         basicOrder.setCooperationOrganName(cooperationOrganMap.get(basicOrder.getMusicGroupId()).getName());