车载终端挂载列表

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -12,7 +12,6 @@ import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.BaseVehicleTerminal;
-import com.ozs.entity.vo.BaseCameraManagementDto;
 import com.ozs.entity.vo.BaseVehicleTerminalDto;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.entity.vo.BaseVehicleVo;
@@ -215,8 +214,12 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
             List<BaseVehicleTerminalVo> dto1 = page.getResult().stream().map(o -> {
                 BaseVehicleTerminalVo baseVehicleTerminalVo = new BaseVehicleTerminalVo();
                 BeanUtils.copyProperties(o, baseVehicleTerminalVo);
-                if (baseTerminal.getTerminalCode().equals(o.getTerminalCode())) {
-                    baseVehicleTerminalVo.setIsMount("2");
+                if (!StringUtils.isEmptySunhh(baseTerminal)) {
+                    if (baseTerminal.getTerminalCode().equals(o.getTerminalCode())) {
+                        baseVehicleTerminalVo.setIsMount("2");
+                    } else {
+                        baseVehicleTerminalVo.setIsMount("1");
+                    }
                 } else {
                     baseVehicleTerminalVo.setIsMount("1");
                 }