修改

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

@@ -39,7 +39,7 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 	@Autowired
 	@Autowired
 	private MapLayerCustomizeSkillMPDao mapLayerCustomizeSkillMPDao;
 	private MapLayerCustomizeSkillMPDao mapLayerCustomizeSkillMPDao;
 	@Autowired
 	@Autowired
-	private OrgGroupMPDao orgGroupMPDao;
+	private OrgGroupDao orgGroupDao;
 	@Autowired
 	@Autowired
 	private OrgBranchMPDao orgBranchMPDao;
 	private OrgBranchMPDao orgBranchMPDao;
 	@Autowired
 	@Autowired
@@ -58,15 +58,18 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 	public Result<?> businessCustomLayers(String levelType, String levelValue, long page, long size) throws BusinessException {
 	public Result<?> businessCustomLayers(String levelType, String levelValue, long page, long size) throws BusinessException {
 
 
 		// 获取branchIds
 		// 获取branchIds
-		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);
-		List<OrgGroup> groups = orgGroupMPDao.selectList(lqw);
+		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);
+		}
 		if (ListUtils.isEmpty(groups)) {
 		if (ListUtils.isEmpty(groups)) {
 			throw new BusinessException("大区/分部/小组组织结构配置可能错误或缺失，请联系管理员/研发");
 			throw new BusinessException("大区/分部/小组组织结构配置可能错误或缺失，请联系管理员/研发");
 		}
 		}
-		List<String> branchIds = new ArrayList<>(groups.stream().map(OrgGroup::getBranchId).collect(Collectors.toSet()));
+		List<String> branchIds = new ArrayList<>(groups.stream().map(OrgGroupEntity::getBranchId).collect(Collectors.toSet()));
 
 
 		// 获取skillCode与skillName映射信息
 		// 获取skillCode与skillName映射信息
 		List<SkillInfo> skills = skillInfoMPDao.selectList(null);
 		List<SkillInfo> skills = skillInfoMPDao.selectList(null);