Commit 570b2f87 authored by 李秀明's avatar 李秀明

系统部件图标取值修改

parent c90e6808
...@@ -304,7 +304,8 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting ...@@ -304,7 +304,8 @@ public class FireFightingSystemGroupServiceImpl extends ServiceImpl<FireFighting
equipment.put("num", Integer.valueOf(equipmentMap.getOrDefault("count", "0").toString())); equipment.put("num", Integer.valueOf(equipmentMap.getOrDefault("count", "0").toString()));
equipment.put("unit", equipmentMap.get("unit")); equipment.put("unit", equipmentMap.get("unit"));
if (Objects.nonNull(imageEquipment)) { if (Objects.nonNull(imageEquipment)) {
equipment.put("img", StringUtils.hasText(imageEquipment.getShbzImg()) ? imageEquipment.getShbzImg() : imageEquipment.getImg()); // equipment.put("img", StringUtils.hasText(imageEquipment.getShbzImg()) ? imageEquipment.getShbzImg() : imageEquipment.getImg());
equipment.put("img", imageEquipment.getImg());
} }
equipment.put("sort", relationEntity.getSort()); equipment.put("sort", relationEntity.getSort());
equipment.put("type", relationEntity.getType()); equipment.put("type", relationEntity.getType());
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
wle.NAME equipment_name, wle.NAME equipment_name,
count(spe.id) num, count(spe.id) num,
unit.name unit_name, unit.name unit_name,
wle.shbz_img img, wle.img img,
cate.NAME AS equipmentCateGoryName cate.NAME AS equipmentCateGoryName
FROM FROM
wl_equipment_specific AS spe wl_equipment_specific AS spe
......
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