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

@@ -850,8 +850,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      */
     private void checkCarNumberUniquenessWithHisCC(LinkedHashMap<?, ?> equipmentInfoForm, String record, String dataSource) {
         if (dataSource.contains("his") && EquipmentClassifityEnum.CC.getCode().equals(equipmentInfoForm.get(EQU_LIST)) && !ValidationUtil.isEmpty(equipmentInfoForm.get(CAR_NUMBER))) {
+            String carNumber = String.valueOf(equipmentInfoForm.get(CAR_NUMBER));
+            if (!"无".equals(carNumber)) {
                 Integer count = idxBizJgRegisterInfoService.lambdaQuery()
-                    .eq(IdxBizJgRegisterInfo::getCarNumber, equipmentInfoForm.get(CAR_NUMBER))
+                        .eq(IdxBizJgRegisterInfo::getCarNumber, carNumber)
                         .ne(!StringUtils.isEmpty(record), IdxBizJgRegisterInfo::getRecord, record)
                         .count();
                 if (count > 0) {
@@ -859,6 +861,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 }
             }
         }
+    }
 
     private void check96333Code(LinkedHashMap equipmentInfoForm) {
         if (!ObjectUtils.isEmpty(equipmentInfoForm.get(CODE96333))) {

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

@@ -3357,14 +3357,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             // 场车设备校验车牌号的唯一性
             if (EquipmentClassifityEnum.CC.getCode().equals(map.get("EQU_LIST_CODE"))) {
+                String carNum = String.valueOf(map.get(carNumber));
+                if (!"无".equals(carNum)) {
                     Integer count = idxBizJgRegisterInfoService.lambdaQuery()
-                        .eq(IdxBizJgRegisterInfo::getCarNumber, map.get(carNumber))
-                        .ne(!com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(equipId), IdxBizJgRegisterInfo::getRecord, equipId)
+                            .eq(IdxBizJgRegisterInfo::getCarNumber, carNum)
+                            .ne(!StringUtils.isEmpty(equipId), IdxBizJgRegisterInfo::getRecord, equipId)
                             .count();
                     if (count > 0) {
                         throw new BadRequest("车牌号已存在，请重新输入！");
                     }
                 }
+            }
 
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             CompanyBo company = reginParams.getCompany();