Commit d805f471 authored by 李秀明's avatar 李秀明

fix: 设备平台-消防系统配置-删除分组SQL空指针报错处理

parent f2c93380
...@@ -104,10 +104,10 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting ...@@ -104,10 +104,10 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting
// 更新数据前先清理解绑的系统与相关关系表的数据 // 更新数据前先清理解绑的系统与相关关系表的数据
if (Objects.nonNull(fireFightingSystemGroupModalDto.getId())) { if (Objects.nonNull(fireFightingSystemGroupModalDto.getId())) {
FireFightingSystemGroupEntity entity = fireFightingSystemGroupMapper.selectById(fireFightingSystemGroupModalDto.getId()); FireFightingSystemGroupEntity entity = fireFightingSystemGroupMapper.selectById(fireFightingSystemGroupModalDto.getId());
String[] systemIds = entity.getSystemIds().split(","); List<String> systemIds = Arrays.asList(entity.getSystemIds().split(","));
systemEquipmentRelationService.remove( systemEquipmentRelationService.remove(
Wrappers.<SystemEquipmentRelationEntity>lambdaQuery() Wrappers.<SystemEquipmentRelationEntity>lambdaQuery()
.in(SystemEquipmentRelationEntity::getSystemId, (Object) systemIds) .in(SystemEquipmentRelationEntity::getSystemId, systemIds)
); );
} }
...@@ -200,6 +200,9 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting ...@@ -200,6 +200,9 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting
.orderByAsc(FireFightingSystemGroupEntity::getSort, FireFightingSystemGroupEntity::getCreateDate) .orderByAsc(FireFightingSystemGroupEntity::getSort, FireFightingSystemGroupEntity::getCreateDate)
); );
List<Long> systemIds = groupEntities.stream().map(FireFightingSystemGroupEntity::getSystemIds).map(s -> s.split(",")).flatMap(Arrays::stream).map(Long::parseLong).collect(Collectors.toList()); List<Long> systemIds = groupEntities.stream().map(FireFightingSystemGroupEntity::getSystemIds).map(s -> s.split(",")).flatMap(Arrays::stream).map(Long::parseLong).collect(Collectors.toList());
if (systemIds.isEmpty()) {
return new JSONArray();
}
// List to Map -> key: systemId, value: FireFightingSystemEntity // List to Map -> key: systemId, value: FireFightingSystemEntity
Map<Long, FireFightingSystemEntity> systemMap = fireFightingSystemMapper.selectList( Map<Long, FireFightingSystemEntity> systemMap = fireFightingSystemMapper.selectList(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment