Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542

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

@@ -82,8 +82,8 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 
         // 获取skillCode与skillName映射信息
         List<SkillInfoEntity> skills = skillInfoDao.findAll();
-        Map<String, String> skillMapping = skills.stream().collect(Collectors.toMap(
-                SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkillCode));
+        // Map<String, String> skillMapping = skills.stream().collect(Collectors.toMap(
+        //         SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkillCode));
 
         //获取分页列表
         Specification<MapLayerCustomizeEntity> specification = (root, query, criteriaBuilder) -> {
@@ -112,8 +112,8 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
             List<String> skillItems = this.queryLayerSkill(layer.getLayerId());
             item.setSkillNum(skillItems.size());
 
-            List<String> skillNames = skillItems.stream().map(s -> skillMapping.getOrDefault(s, "")).collect(Collectors.toList());
-            String skillDesc = String.join("、", new ArrayList<>(new HashSet<>(skillNames)));
+            // List<String> skillNames = skillItems.stream().map(s -> skillMapping.getOrDefault(s, "")).collect(Collectors.toList());
+            String skillDesc = String.join("、", new ArrayList<>(new HashSet<>(skillItems)));
             item.setSkillList(skillDesc);
 
             items.add(item);