mp2jpa

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

@@ -43,7 +43,7 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 	@Autowired
 	private OrgBranchMPDao orgBranchMPDao;
 	@Autowired
-	private SkillInfoMPDao skillInfoMPDao;
+	private SkillInfoDao skillInfoDao;
 	@Autowired
 	private ISaaSRemoteService saasRemoteService;
 	@Autowired
@@ -72,8 +72,9 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 		List<String> branchIds = new ArrayList<>(groups.stream().map(OrgGroupEntity::getBranchId).collect(Collectors.toSet()));
 
 		// 获取skillCode与skillName映射信息
-		List<SkillInfo> skills = skillInfoMPDao.selectList(null);
-		Map<String, String> skillMapping = skills.stream().collect(Collectors.toMap(SkillInfo::getSkillCode, SkillInfo::getSkillCode));
+		List<SkillInfoEntity> skills = skillInfoDao.findAll();
+		Map<String, String> skillMapping = skills.stream().collect(Collectors.toMap(
+				SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkillCode));
 
 		Page<MapLayerCustomize> pg = new Page(page, size);
 		LambdaQueryWrapper<MapLayerCustomize> mapWrapper = new LambdaQueryWrapper<>();
@@ -271,8 +272,9 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 	private List<String> queryLayerSkill(String layerId) {
 		List<String> items = new ArrayList<>();
 
-		List<SkillInfo> skills = skillInfoMPDao.selectList(null);
-		Map<String, String> skillMap = skills.stream().collect(Collectors.toMap(SkillInfo::getSkillCode, SkillInfo::getSkill));
+		List<SkillInfoEntity> skills = skillInfoDao.findAll();
+		Map<String, String> skillMap = skills.stream().collect(Collectors.toMap(
+				SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkill));
 
 		List<MapLayerCustomizeSkill> laySkills = mapLayerCustomizeSkillMPDao.selectByLayerId(layerId);
 		for (MapLayerCustomizeSkill s : laySkills) {