修改

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

@@ -65,7 +65,7 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 
 		// 获取skillCode与skillName映射信息
 		List<SkillInfo> skills = skillInfoMPDao.selectList(null);
-		Map<String, String> branchNames = skills.stream().collect(Collectors.toMap(SkillInfo::getSkillCode, SkillInfo::getSkillCode));
+		Map<String, String> skillMapping = skills.stream().collect(Collectors.toMap(SkillInfo::getSkillCode, SkillInfo::getSkillCode));
 
 		Page<MapLayerCustomize> pg = new Page(page, size);
 		LambdaQueryWrapper<MapLayerCustomize> mapWrapper = new LambdaQueryWrapper<>();
@@ -81,12 +81,17 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 			item.setLayerId(layer.getLayerId());
 			item.setLayerName(layer.getLayer());
 			item.setLayerDesc(layer.getLayerDescribe());
-			item.setBranchName(branchNames.getOrDefault(layer.getBranchId(), ""));
+
+			OrgBranch branch = orgBranchMPDao.getByBranchId(layer.getBranchId());
+			if (branch != null) {
+				item.setBranchName(branch.getBranchName());
+			}
 
 			List<String> skillItems = this.queryLayerSkill(layer.getLayerId());
 			item.setSkillNum(skillItems.size());
 
-			String skillDesc = String.join("、", new ArrayList<>(new HashSet<>(skillItems)));
+			List<String> skillNames = skillItems.stream().map(s -> skillMapping.getOrDefault(s, "")).collect(Collectors.toList());
+			String skillDesc = String.join("、", new ArrayList<>(new HashSet<>(skillNames)));
 			item.setSkillList(skillDesc);
 
 			items.add(item);