add

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

@@ -1137,11 +1137,14 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
             op.setSmallId(sysDictRefXLMap.get(String.valueOf(mx.getXlid())).get(0).getDictCode());
             op.setSmallName(sysDictRefXLMap.get(String.valueOf(mx.getXlid())).get(0).getDictValue());
         }
+
         op.setSeriesId(mx.getXiid());
         op.setSeriesName(mx.getXimc());
-        if (!mx.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(mx.getXiid())) {
-            op.setSeriesId(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictCode());
-            op.setSeriesName(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictValue());
+        if (StringUtils.isNotEmpty(mx.getXiid())){
+            if (!mx.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(mx.getXiid())) {
+                op.setSeriesId(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictCode());
+                op.setSeriesName(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictValue());
+            }
         }
 
         op.setProductId(mx.getJxno());

src/main/resources/mapper/ReasonOrderRepairDetailMapper.xml

@@ -7,7 +7,7 @@
                a.out_id as wxxmguid,'guangfo' as created_by,
                a.create_time as created_date,'guangfo' as last_modified_by,
                a.update_time as last_modified_date,
-               b.brand_wxjsguid as wxjsguid,a.repair_item_id as wxxmh,
+               b.brand_wxjsguid as wxjsguid,ifnull(a.repair_item_id,'') as wxxmh,
                a.repair_item_name as mshu,ifnull(b.repair_fees,0) as wxfy,c.number as xxyyh,
                c.xxyyguid,ifnull(c.wxjsguid,'') as wxjsmxguid,a.create_time as cjsj,
                a.repair_item_name as wxxmhmc,case b.flag when 'A' then '上门' else '送修' end as smorsx