MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -1754,9 +1754,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
                 //商品关联题库
                 if (StringUtils.isNotBlank(goods.getQuestionRelIds())){
-                    String collect = Arrays.stream(goods.getQuestionRelIds().split(","))
-                            .map(x -> getNewId(Long.valueOf(x), GoodsCopyEnum.GOODS.getType()).toString()).collect(Collectors.joining(","));
-                    goods.setQuestionRelIds(collect);
+                    List<Long> relIds = Arrays.stream(goods.getQuestionRelIds().split(","))
+                            .map(x -> getNewIdByTenant(Long.valueOf(x), GoodsCopyEnum.GOODS.getType(), newTenantId)).collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(relIds)){
+                        String collect = relIds.stream().map(x -> x.toString()).collect(Collectors.joining(","));
+                        goods.setQuestionRelIds(collect);
+                    }
                 }
 
                 //规格模板