fix(ops): 修复区域设备索引初始化查询条件
问题:selectListByAreaIdAndRelationType(null, "BADGE") 生成 WHERE area_id = NULL 导致查询结果为空,索引无法初始化 修复:areaId 为 null 时不添加该查询条件,查询所有 BADGE 类型设备 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -18,16 +18,20 @@ public interface OpsAreaDeviceRelationMapper extends BaseMapperX<OpsAreaDeviceRe
|
|||||||
/**
|
/**
|
||||||
* 根据区域ID和关联类型查询关联关系
|
* 根据区域ID和关联类型查询关联关系
|
||||||
*
|
*
|
||||||
* @param areaId 区域ID
|
* @param areaId 区域ID(可为null,表示查询所有区域)
|
||||||
* @param relationType 关联类型(TRAFFIC_COUNTER/BEACON/BADGE)
|
* @param relationType 关联类型(TRAFFIC_COUNTER/BEACON/BADGE)
|
||||||
* @return 关联关系列表
|
* @return 关联关系列表
|
||||||
*/
|
*/
|
||||||
default List<OpsAreaDeviceRelationDO> selectListByAreaIdAndRelationType(Long areaId, String relationType) {
|
default List<OpsAreaDeviceRelationDO> selectListByAreaIdAndRelationType(Long areaId, String relationType) {
|
||||||
return selectList(new LambdaQueryWrapperX<OpsAreaDeviceRelationDO>()
|
LambdaQueryWrapperX<OpsAreaDeviceRelationDO> wrapper = new LambdaQueryWrapperX<OpsAreaDeviceRelationDO>()
|
||||||
.eq(OpsAreaDeviceRelationDO::getAreaId, areaId)
|
|
||||||
.eq(OpsAreaDeviceRelationDO::getRelationType, relationType)
|
.eq(OpsAreaDeviceRelationDO::getRelationType, relationType)
|
||||||
.eq(OpsAreaDeviceRelationDO::getEnabled, true)
|
.eq(OpsAreaDeviceRelationDO::getEnabled, true);
|
||||||
.orderByDesc(OpsAreaDeviceRelationDO::getCreateTime));
|
|
||||||
|
if (areaId != null) {
|
||||||
|
wrapper.eq(OpsAreaDeviceRelationDO::getAreaId, areaId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return selectList(wrapper.orderByDesc(OpsAreaDeviceRelationDO::getCreateTime));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user