Commit c3ed56ad by huangjinxin

fix:图层技能展示

1 parent 9909f927
......@@ -169,7 +169,7 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
}
String layerId = UUID.randomUUID().toString().replace("-", "");
// 同步创建saas图层,返回layerId
String saasLayerName = branchId + "_" + layerId;
String result = saasRemoteService.addLayer(ak, saasLayerName, 1, 1);
......@@ -304,16 +304,16 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
List<String> items = new ArrayList<>();
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);
for (MapLayerCustomizeSkillEntity s : laySkills) {
if (s.getStatus() == 0) {
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;
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!