bugfix：台套认领设备使用登记证编号校验修改

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

@@ -835,6 +835,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         if (dataSource.contains("his")) {
             // 使用登记证编号校验
+            this.checkUseRegistrationCodeIsNotNUll(equipmentInfoForm);
             this.checkUseRegistrationCode(equipmentInfoForm);
         }
 
@@ -887,9 +888,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 .map(String::valueOf)
                 .map(String::trim)
                 .orElse(null);
-        if (useRegistrationCode == null) {
-            throw new BadRequest("请填写使用登记证编号后进行暂存！");
-        }
         String equipId = String.valueOf(equipmentInfoForm.get("RECORD"));
         // 校验使用登记证编号的唯一性
         if (!CylinderTypeEnum.CYLINDER.getCode().equals(equipmentInfoForm.get("EQU_CATEGORY")) && commonService.useRegistrationCertificateAccountUnique(useRegistrationCode, equipId)) {
@@ -913,6 +911,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         idxBizJgRegisterInfoService.checkUseRegistrationCode(useRegistrationCode, regType);
     }
 
+    /**
+     * 使用登记证编号为空相关校验
+     * @param equipmentInfoForm
+     */
+    private void checkUseRegistrationCodeIsNotNUll(LinkedHashMap equipmentInfoForm) {
+        String useRegistrationCode = Optional.ofNullable(equipmentInfoForm.get("useRegistrationCode"))
+                .map(String::valueOf)
+                .map(String::trim)
+                .orElse(null);
+        if (useRegistrationCode == null) {
+            throw new BadRequest("请填写使用登记证编号后进行暂存！");
+        }
+    }
+
 
     private Object checkAndCast(Object obj) {
         if (obj instanceof LinkedHashMap) {