|
@@ -1104,11 +1104,11 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
}
|
|
|
// 查询上级
|
|
|
if (CollectionUtils.isNotEmpty(parentIds)) {
|
|
|
- List<MemberRankSetting> parents = memberRankSettingDao.selectBatchIds(parentIds);
|
|
|
+ List<MemberRankSetting> parents = memberRankSettingDao.getNotDelByIds(parentIds);
|
|
|
dataList.addAll(parents);
|
|
|
}
|
|
|
if (CollectionUtils.isNotEmpty(topIds)) {
|
|
|
- List<MemberRankSetting> tops = memberRankSettingDao.selectBatchIdsByParentIds(topIds);
|
|
|
+ List<MemberRankSetting> tops = memberRankSettingDao.getNotDelByParentIds(topIds);
|
|
|
|
|
|
dataList.addAll(tops);
|
|
|
}
|
|
@@ -1208,7 +1208,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
throw new BizException("存在学员使用、或销售,不可删除");
|
|
|
}
|
|
|
// 判断是否存在子集
|
|
|
- List<MemberRankSetting> memberRankSettings = memberRankSettingDao.selectBatchIdsByParentIds(Lists.newArrayList(id));
|
|
|
+ List<MemberRankSetting> memberRankSettings = memberRankSettingDao.getNotDelByParentIds(Lists.newArrayList(id));
|
|
|
memberRankSettings = memberRankSettings.stream().filter(o -> !o.getDelFlag()).collect(Collectors.toList());
|
|
|
if (CollectionUtils.isNotEmpty(memberRankSettings)) {
|
|
|
throw new BizException("存在子级,不可删除");
|