diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
index c091bc8db..28077133d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
@@ -25,6 +25,7 @@ import com.zhgd.xmgl.modules.car.enums.CarInfoCarModuleTypeEnum;
 import com.zhgd.xmgl.modules.car.mapper.*;
 import com.zhgd.xmgl.modules.car.service.ICarInfoService;
 import com.zhgd.xmgl.modules.project.entity.Project;
+import com.zhgd.xmgl.modules.project.entity.vo.ProjectInfoExtVo;
 import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
 import com.zhgd.xmgl.modules.project.service.impl.ProjectServiceImpl;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
@@ -124,13 +125,24 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
             if (Objects.equals(old.getCarModuleType(), CarInfoCarModuleTypeEnum.GD.getValue())) {
                 throw new OpenAlertException("该车辆已添加，请勿重复添加！");
             }
-            addCarInfoForApprovalFlowIf(c);
             Date now = new Date();
-            Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getSyncHikvision, 1)
-                    .eq(Project::getProjectSn, c.getProjectSn()));
-            if (project == null) {
+            boolean isHk = projectCarCameraConfigService.isHikvisionConfig(c.getProjectSn());
+            if (!isHk) {
                 return;
             }
+            //新增的时候，原本是黑名单车，新增白名单车，提示“此车辆已被拉黑，无法再进行新增”。
+            //新增的时候，原本是白名单车，新增黑名单车，提示“此车辆是白名单，无法新增为黑名单，若需要拉黑车辆，可编辑或点击拉入黑名单按钮”。
+            //新增的时候，原本是黑名单车，新增黑名单车，提示“此车辆已被拉黑”。
+            if (Objects.equals(old.getIsBlack(), 1) && !Objects.equals(c.getIsBlack(), 1)) {
+                throw new OpenAlertException("此车辆已被拉黑，无法再进行新增");
+            } else if (!Objects.equals(old.getIsBlack(), 1) && Objects.equals(c.getIsBlack(), 1)) {
+                throw new OpenAlertException("此车辆是白名单，无法新增为黑名单，若需要拉黑车辆，可编辑或点击拉入黑名单按钮");
+            } else if (Objects.equals(old.getIsBlack(), 1) && Objects.equals(c.getIsBlack(), 1)) {
+                throw new OpenAlertException("此车辆已被拉黑");
+            }
+
+            addCarInfoForApprovalFlowIf(c);
+            ProjectInfoExtVo project = projectService.getProjectInfoBySn(c.getProjectSn());
             if (c.getIsBlack() == 1) {
                 deleteCarInfoForHikvision(old, true);
             } else {
@@ -163,7 +175,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
      * @param c
      */
     private void addCarInfoForApprovalFlowIf(CarInfo c) {
-        if (isReservationType(c)) {
+        if (isReservationType(c) && !Objects.equals(c.getIsBlack(), 1)) {
             CarInfoApprovalFlow flow = new CarInfoApprovalFlow();
             BeanUtil.copyProperties(c, flow);
             flow.setIsBlack(0);