add

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

@@ -4,6 +4,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.mysql.cj.x.protobuf.MysqlxDatatypes;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.GDAppointStatusEnum;
 import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
@@ -1320,7 +1321,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
         // 获取采集附件数据 (家用、商用、其他)  TL_fa_order_install_detail_append_js
         if ("cj".equals(cjOrWg)){
-            if (!getcjfjdataCj(orderBase, detail, mainName, taskno)){
+            if (!getcjfjdataCj(detail, mainName, taskno)){
                 return Boolean.FALSE;
             }
         }
@@ -1525,7 +1526,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return itfTblazwgmxsykttmmxlsService.save(ls);
     }
 
-    private Boolean getcjfjdataCj(OrderBase orderBase, OrderInstallDetail detail, String mainName, String taskno) {
+    private Boolean getcjfjdataCj(OrderInstallDetail detail, String mainName, String taskno) {
         // 安装工单采集附件表提取数据
         InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
         installCJDetailFile.setOrderNo(detail.getOrderBaseId());
@@ -1541,6 +1542,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             if (StringUtils.isEmpty(file.getBrandFilePath())){
                 return Boolean.TRUE;
             }
+            if (StringUtils.isEmpty(file.getFjguid())){
+                return Boolean.TRUE;
+            }
             // 提取获取采集明细表数据中获取pgwcmxid(生成格力总部-采集明细序号)
             OrderInstallDetail detailone = orderInstallDetailService.lambdaQuery()
                     .eq(OrderInstallDetail::getOrderBaseId,file.getOrderBaseId())