Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -809,6 +809,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             List<String> records = eqList.stream().map(JgUseRegistrationEq::getEquId).collect(toList());
             //合并的管道只需要子工程装置管道集合
             if (Objects.nonNull(data.getOriginProjectContraptionIds()) &&
+                    Objects.nonNull(data.getProjectContraptionId()) &&
                     !data.getOriginProjectContraptionIds().contains(data.getProjectContraptionId())) {
                 List<IdxBizJgUseInfo> useInfoRecords = idxBizJgUseInfoService.lambdaQuery()
                         .select(IdxBizJgUseInfo::getRecord)