封存

src/main/java/com/fdkankan/ucenter/service/impl/UserIncrementServiceImpl.java

@@ -81,8 +81,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         }
         Page<UserIncrement> page = new Page<>(param.getPageNum(), param.getPageSize());
         LambdaQueryWrapper<UserIncrement> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(UserIncrement::getIsExpired,0);
         queryWrapper.eq(UserIncrement::getUserId,user.getId());
+        queryWrapper.and(i ->i.eq(UserIncrement::getIsExpired,0).or().isNotNull(UserIncrement::getCameraId));
         if(cameraIdList!=null ){
             queryWrapper.in(UserIncrement::getCameraId,cameraIdList);
         }