mp2jpa

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

@@ -35,9 +35,6 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 	private MapBlockInfoMPDao mapBlockInfoMPDao;
 	private MapBlockInfoMPDao mapBlockInfoMPDao;
 
 
 	@Autowired
 	@Autowired
-	private OrgGroupMPDao orgGroupMPDao;
-
-	@Autowired
 	private MapLayerMPDao mapLayerMPDao;
 	private MapLayerMPDao mapLayerMPDao;
 
 
 	@Autowired
 	@Autowired
@@ -102,8 +99,8 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 
 
 		// 获取groupId集合
 		// 获取groupId集合
 		Set<String> groupIds = teams.stream().map(OrgTeamEntity::getGroupId).collect(Collectors.toSet());
 		Set<String> groupIds = teams.stream().map(OrgTeamEntity::getGroupId).collect(Collectors.toSet());
-		List<OrgGroup> groups = orgGroupMPDao.selectByGroupIds(new ArrayList<>(groupIds));
-		Map<String, String> groupMapping = groups.stream().collect(Collectors.toMap(OrgGroup::getGroupId, OrgGroup::getGroupName));
+		List<OrgGroupEntity> groups = orgGroupDao.findByGroupIdIn(new ArrayList<>(groupIds));
+		Map<String, String> groupMapping = groups.stream().collect(Collectors.toMap(OrgGroupEntity::getGroupId, OrgGroupEntity::getGroupName));
 
 
 		Page<MapBlockInfo> pg = new Page<>(page, size);
 		Page<MapBlockInfo> pg = new Page<>(page, size);
 		LambdaQueryWrapper<MapBlockInfo> lqwBlock = new LambdaQueryWrapper<>();
 		LambdaQueryWrapper<MapBlockInfo> lqwBlock = new LambdaQueryWrapper<>();
@@ -285,11 +282,15 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		}
 		}
 
 
 		// 获取自定义图层(只有branch才能创建自定义图层)
 		// 获取自定义图层(只有branch才能创建自定义图层)
-		LambdaQueryWrapper<OrgGroup> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(levelType.equals("cluster"), OrgGroup::getClusterId, levelValue);
-		lqw.eq(levelType.equals("branch"), OrgGroup::getBranchId, levelValue);
-		lqw.eq(levelType.equals("group"), OrgGroup::getGroupId, levelValue);
-		Set<String> branchIds = orgGroupMPDao.selectList(lqw).stream().map(OrgGroup::getBranchId).collect(Collectors.toSet());
+		List<OrgGroupEntity> groups = new ArrayList<>();
+		if(levelType.equals("cluster")) {
+			groups = orgGroupDao.findAllByClusterId(levelValue);
+		} else if(levelType.equals("branch")){
+			groups = orgGroupDao.findAllByBranchId(levelValue);
+		} else if (levelType.equals("group")) {
+			groups = orgGroupDao.findAllByGroupId(levelValue);
+		}
+		Set<String> branchIds = groups.stream().map(OrgGroupEntity::getBranchId).collect(Collectors.toSet());
 		if (branchIds.isEmpty()) {
 		if (branchIds.isEmpty()) {
 			return Result.success(items);
 			return Result.success(items);
 		}
 		}