Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemGroupServiceImpl.java

@@ -235,12 +235,12 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting
             }
         }
 
-        // 查询装备定义的图片 List to Map -> key: systemId@equipmentId, value: 装备定义数量Map
+        // 查询装备定义的图片 List to Map -> key: equipmentId, value: equipmentEntity
         Set<Long> equipmentIds = systemEquipmentMap.values().stream().flatMap(list -> list.stream().map(SystemEquipmentRelationEntity::getEquipmentId)).collect(Collectors.toSet());
         Map<Long, Equipment> equipmentImageMap = equipmentService.list(
                 Wrappers.<Equipment>lambdaQuery()
                         .select(Equipment::getId, Equipment::getShbzImg, Equipment::getImg)
-                        .in(Equipment::getId, equipmentIds)
+                        .in(!equipmentIds.isEmpty(), Equipment::getId, equipmentIds)
         ).stream().map(equipmentEntity -> new HashMap<Long, Equipment>() {{
             put(equipmentEntity.getId(), equipmentEntity);
         }}).collect(Collectors.toMap(map -> map.keySet().iterator().next(), map -> map.values().iterator().next()));