mybatisplus to jpa

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

@@ -47,7 +47,7 @@ public class OrderAssignImpl implements OrderAssign {
 	private OrderAssignCheck orderAssignCheck;
 	private OrderAssignCheck orderAssignCheck;
 
 
 	@Autowired
 	@Autowired
-	private OrgTeamMPDao orgTeamMPDao;
+	private OrgTeamDao orgTeamDao;
 
 
 	@Autowired
 	@Autowired
 	private OrgTeamEngineerDao orgTeamEngineerDao;
 	private OrgTeamEngineerDao orgTeamEngineerDao;
@@ -285,12 +285,18 @@ public class OrderAssignImpl implements OrderAssign {
 		} else {
 		} else {
 			return new HashSet<>();
 			return new HashSet<>();
 		}
 		}
-		LambdaQueryWrapper<OrgTeam> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(levelType.equals("cluster"), OrgTeam::getClusterId, levelValue);
-		lqw.eq(levelType.equals("branch"), OrgTeam::getBranchId, levelValue);
-		lqw.eq(levelType.equals("group"), OrgTeam::getGroupId, levelValue);
-		lqw.eq(levelType.equals("team"), OrgTeam::getTeamId, levelValue);
-		List<String> groupIds = orgTeamMPDao.selectList(lqw).stream().map(OrgTeam::getGroupId).collect(Collectors.toList());
+
+		List<OrgTeamEntity> teams = new ArrayList<>();
+		if(levelType.equals("cluster")){
+			teams = orgTeamDao.findAllByClusterId(levelValue);
+		} else if (levelType.equals("branch")){
+			teams = orgTeamDao.findAllByBranchId(levelValue);
+		} else if (levelType.equals("group")){
+			teams = orgTeamDao.findAllByGroupId(levelValue);
+		} else if (levelType.equals("team")){
+			teams = orgTeamDao.findAllByTeamId(levelValue);
+		}
+		List<String> groupIds = teams.stream().map(OrgTeamEntity::getGroupId).collect(Collectors.toList());
 		return engineerInfoDao.findByGroupIdIn(groupIds).stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toSet());
 		return engineerInfoDao.findByGroupIdIn(groupIds).stream().map(EngineerInfoEntity::getEngineerCode).collect(Collectors.toSet());
 	}
 	}