相机版本升级 条件修改

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

@@ -337,7 +337,10 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             wrapper.like(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
-            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+//            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            wrapper.and((wp) -> {
+                wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            });
         }
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
         return baseCameraManagements;