fix：图层技能展示

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessLayerServiceImpl.java

@@ -304,16 +304,16 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
         List<String> items = new ArrayList<>();
         List<String> items = new ArrayList<>();
 
 
         List<SkillInfoEntity> skills = skillInfoDao.findAll();
         List<SkillInfoEntity> skills = skillInfoDao.findAll();
-        Map<String, String> skillMap = skills.stream().collect(Collectors.toMap(
-                SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkill));
+        Map<String, SkillInfoEntity> skillMap = skills.stream().collect(Collectors.toMap(
+                SkillInfoEntity::getSkillCode, e -> e));
 
 
         List<MapLayerCustomizeSkillEntity> laySkills = mapLayerCustomizeSkillDao.findByLayerId(layerId);
         List<MapLayerCustomizeSkillEntity> laySkills = mapLayerCustomizeSkillDao.findByLayerId(layerId);
         for (MapLayerCustomizeSkillEntity s : laySkills) {
         for (MapLayerCustomizeSkillEntity s : laySkills) {
             if (s.getStatus() == 0) {
             if (s.getStatus() == 0) {
                 continue;
                 continue;
             }
             }
-            String skill = skillMap.getOrDefault(s.getSkillCode(), "");
-            items.add(skill);
+            SkillInfoEntity skill = skillMap.getOrDefault(s.getSkillCode(), null);
+            items.add(skill.getType() + "-" + skill.getSkill());
         }
         }
         return items;
         return items;
     }
     }