fix(jg):车用气瓶bug修改

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

@@ -2959,12 +2959,12 @@ public class CommonServiceImpl implements ICommonService {
             log.error("日期转换失败：", e);
         }
         ResponseModel<String> responseModel = null;
-        if (isValidCreditCode(receiveCompanyCode)) {
+        if (StringUtils.isNotBlank(receiveCompanyCode) && isValidCreditCode(receiveCompanyCode)) {
             String equCode = Optional.ofNullable(equType.get("equDefineCode")).orElse(equType.get("equCategoryCode"));
             String registrationCode = equCode + receiveCompanyCode + ym;
             responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
         }
-        return responseModel.getResult();
+        return Optional.ofNullable(responseModel).map(ResponseModel::getResult).orElse("");
     }
 
     // 校验信用代码是否符合要求

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

@@ -951,7 +951,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if (dataSource.contains("his")) {
                 String VIN = (String) equipmentInfoForm.get("identificationCode");
                 String useRegistrationCode = (String) equipmentInfoForm.get("useRegistrationCode");
-                if (!ValidationUtil.isEmpty(VIN) || !ValidationUtil.isEmpty(useRegistrationCode)) {
+                if (!ValidationUtil.isEmpty(VIN) && !ValidationUtil.isEmpty(useRegistrationCode)) {
                     ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
                     String companyType = reginParams.getCompany().getCompanyType();
                     String companyCode = "个人主体".equals(companyType) ? reginParams.getCompany().getCompanyCode().split("_")[1] : reginParams.getCompany().getCompanyCode();