add

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -2566,7 +2566,8 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
             insertnum=1;
             outid=1;
             // 生成工单产品对象
-            OrderProduct op = getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, mx, productMap);
+            OrderProduct op = getOrderProduct(orderBase, orderProducts, sysDictRefDLMap, sysDictRefXLMap,
+                    sysDictRefXiLieMap, mx, productMap);
             // 生成采集明细数据+附件数据
             // 总数量一条条插入，内外机数量不再拆分
             // extracted(orderBase, oids, odfs, insertnum, outid, mx, op);

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -1815,7 +1815,9 @@ public class PublicServiceImpl implements PublicService {
                 .eq(Product::getProductBrandId, brand.getBrandId()).list();
         if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(oldSysProduct)){
             oldSysProduct.stream().forEach(event->{
-                productMap.put(event.getJxid(), event.getProductId());
+                if (StringUtils.isNotEmpty(event.getJxid())){
+                    productMap.put(event.getJxid(), event.getProductId());
+                }
             });
             oldSysProduct.clear();
         }