Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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/JgEquipTransferServiceImpl.java

@@ -914,7 +914,16 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             useUnitCreditCode = useUnitCreditCode.split("_")[1];
         }
         LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode).eq(IdxBizJgProjectContraption::getIsIntoManagement, true).eq(IdxBizJgProjectContraption::getEquList, "8000").isNotNull(IdxBizJgProjectContraption::getUseRegistrationCode).ne(IdxBizJgProjectContraption::getUseRegistrationCode, "");
+        wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode)
+                .eq(IdxBizJgProjectContraption::getIsIntoManagement, true)
+                .eq(IdxBizJgProjectContraption::getEquList, "8000")
+                .and(w -> w
+                        .isNull(IdxBizJgProjectContraption::getProjectContraptionParentId)
+                        .or()
+                        .eq(IdxBizJgProjectContraption::getProjectContraptionParentId, "")
+                )
+                .isNotNull(IdxBizJgProjectContraption::getUseRegistrationCode)
+                .ne(IdxBizJgProjectContraption::getUseRegistrationCode, "");
         return jgProjectContraptionService.page(page, wrapper);
     }